diff --git a/.github/actions/cargo-check-runtimes/action.yml b/.github/actions/cargo-check-runtimes/action.yml
new file mode 100644
index 000000000000..869f17661e4a
--- /dev/null
+++ b/.github/actions/cargo-check-runtimes/action.yml
@@ -0,0 +1,22 @@
+name: 'cargo check runtimes'
+description: 'Runs `cargo check` for every directory in provided root.'
+inputs:
+  root:
+    description: "Root directory. Expected to contain several cargo packages inside."
+    required: true
+runs:
+  using: "composite"
+  steps:
+    - name: Check
+      shell: bash
+      run: |
+        mkdir -p ~/.forklift
+        cp .forklift/config.toml ~/.forklift/config.toml
+        cd ${{ inputs.root }}
+        for directory in $(echo */); do
+          echo "_____Running cargo check for ${directory} ______";
+          cd ${directory};
+          pwd;
+          SKIP_WASM_BUILD=1 forklift cargo check --locked;
+          cd ..;
+        done
diff --git a/.github/workflows/check-cargo-check-runtimes.yml b/.github/workflows/check-cargo-check-runtimes.yml
new file mode 100644
index 000000000000..ebcf6c5fc9bd
--- /dev/null
+++ b/.github/workflows/check-cargo-check-runtimes.yml
@@ -0,0 +1,136 @@
+name: Check Cargo Check Runtimes
+
+on:
+  pull_request:
+    types: [ opened, synchronize, reopened, ready_for_review, labeled ]
+
+
+# Jobs in this workflow depend on each other, only for limiting peak amount of spawned workers
+
+jobs:
+  # GitHub Actions allows using 'env' in a container context.
+  # However, env variables don't work for forks: https://github.com/orgs/community/discussions/44322
+  # This workaround sets the container image for each job using 'set-image' job output.
+  set-image:
+    if: contains(github.event.label.name, 'GHA-migration') || contains(github.event.pull_request.labels.*.name, 'GHA-migration')
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    outputs:
+      IMAGE: ${{ steps.set_image.outputs.IMAGE }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - id: set_image
+        run: cat .github/env >> $GITHUB_OUTPUT
+  check-runtime-assets:
+    runs-on: arc-runners-polkadot-sdk-beefy
+    needs: [set-image]
+    timeout-minutes: 20
+    container:
+      image: ${{ needs.set-image.outputs.IMAGE }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Run cargo check
+        uses: ./.github/actions/cargo-check-runtimes
+        with:
+          root: cumulus/parachains/runtimes/assets
+
+  check-runtime-collectives:
+    runs-on: arc-runners-polkadot-sdk-beefy
+    needs: [check-runtime-assets, set-image]
+    timeout-minutes: 20
+    container:
+      image: ${{ needs.set-image.outputs.IMAGE }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Run cargo check
+        uses: ./.github/actions/cargo-check-runtimes
+        with:
+          root: cumulus/parachains/runtimes/collectives
+
+  check-runtime-coretime:
+    runs-on: arc-runners-polkadot-sdk-beefy
+    container:
+      image: ${{ needs.set-image.outputs.IMAGE }}
+    needs: [check-runtime-assets, set-image]
+    timeout-minutes: 20
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Run cargo check
+        uses: ./.github/actions/cargo-check-runtimes
+        with:
+          root: cumulus/parachains/runtimes/coretime
+
+  check-runtime-bridge-hubs:
+    runs-on: arc-runners-polkadot-sdk-beefy
+    container:
+      image: ${{ needs.set-image.outputs.IMAGE }}
+    needs: [set-image]
+    timeout-minutes: 20
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Run cargo check
+        uses: ./.github/actions/cargo-check-runtimes
+        with:
+          root: cumulus/parachains/runtimes/bridge-hubs
+
+  check-runtime-contracts:
+    runs-on: arc-runners-polkadot-sdk-beefy
+    container:
+      image: ${{ needs.set-image.outputs.IMAGE }}
+    needs: [check-runtime-collectives, set-image]
+    timeout-minutes: 20
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Run cargo check
+        uses: ./.github/actions/cargo-check-runtimes
+        with:
+          root: cumulus/parachains/runtimes/contracts
+
+  check-runtime-starters:
+    runs-on: arc-runners-polkadot-sdk-beefy
+    container:
+      image: ${{ needs.set-image.outputs.IMAGE }}
+    needs: [check-runtime-assets, set-image]
+    timeout-minutes: 20
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Run cargo check
+        uses: ./.github/actions/cargo-check-runtimes
+        with:
+          root: cumulus/parachains/runtimes/starters
+
+  check-runtime-testing:
+    runs-on: arc-runners-polkadot-sdk-beefy
+    container:
+      image: ${{ needs.set-image.outputs.IMAGE }}
+    needs: [check-runtime-starters, set-image]
+    timeout-minutes: 20
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Run cargo check
+        uses: ./.github/actions/cargo-check-runtimes
+        with:
+          root: cumulus/parachains/runtimes/testing
+
+  confirm-required-jobs-passed:
+    runs-on: ubuntu-latest
+    name: All check-runtime-* tests passed
+    # If any new job gets added, be sure to add it to this array
+    needs:
+      - check-runtime-assets
+      - check-runtime-collectives
+      - check-runtime-coretime
+      - check-runtime-bridge-hubs
+      - check-runtime-contracts
+      - check-runtime-starters
+      - check-runtime-testing
+    steps:
+      - run: echo '### Good job! All the tests passed 🚀' >> $GITHUB_STEP_SUMMARY
diff --git a/.github/workflows/check-runtime-migration.yml b/.github/workflows/check-runtime-migration.yml
index 2b963b2230fb..9b7a6fafcd15 100644
--- a/.github/workflows/check-runtime-migration.yml
+++ b/.github/workflows/check-runtime-migration.yml
@@ -6,6 +6,9 @@ on:
       - master
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
+  # Take a snapshot at 5am when most SDK devs are not working.
+  schedule:
+    - cron: '0 5 * * *'
   merge_group:
   workflow_dispatch:
 
diff --git a/.github/workflows/command-prdoc.yml b/.github/workflows/command-prdoc.yml
index da8f14089cb8..3a08b9a5fb28 100644
--- a/.github/workflows/command-prdoc.yml
+++ b/.github/workflows/command-prdoc.yml
@@ -43,9 +43,21 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  set-image:
+    runs-on: ubuntu-latest
+    outputs:
+      IMAGE: ${{ steps.set_image.outputs.IMAGE }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - id: set_image
+        run: cat .github/env >> $GITHUB_OUTPUT
   cmd-prdoc:
+    needs: [set-image]
     runs-on: ubuntu-latest
     timeout-minutes: 20
+    container:
+      image: ${{ needs.set-image.outputs.IMAGE }}
     permissions:
       contents: write
       pull-requests: write
diff --git a/Cargo.lock b/Cargo.lock
index 67cfbb5968d5..4148b660cd3c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -42,15 +42,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
 
-[[package]]
-name = "aead"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877"
-dependencies = [
- "generic-array 0.14.7",
-]
-
 [[package]]
 name = "aead"
 version = "0.5.2"
@@ -61,18 +52,6 @@ dependencies = [
  "generic-array 0.14.7",
 ]
 
-[[package]]
-name = "aes"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
-dependencies = [
- "cfg-if",
- "cipher 0.3.0",
- "cpufeatures",
- "opaque-debug 0.3.0",
-]
-
 [[package]]
 name = "aes"
 version = "0.8.3"
@@ -84,31 +63,17 @@ dependencies = [
  "cpufeatures",
 ]
 
-[[package]]
-name = "aes-gcm"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc3be92e19a7ef47457b8e6f90707e12b6ac5d20c6f3866584fa3be0787d839f"
-dependencies = [
- "aead 0.4.3",
- "aes 0.7.5",
- "cipher 0.3.0",
- "ctr 0.7.0",
- "ghash 0.4.4",
- "subtle 2.5.0",
-]
-
 [[package]]
 name = "aes-gcm"
 version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1"
 dependencies = [
- "aead 0.5.2",
- "aes 0.8.3",
+ "aead",
+ "aes",
  "cipher 0.4.4",
- "ctr 0.9.2",
- "ghash 0.5.0",
+ "ctr",
+ "ghash",
  "subtle 2.5.0",
 ]
 
@@ -192,9 +157,9 @@ dependencies = [
  "dunce",
  "heck 0.4.1",
  "proc-macro-error",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
  "syn-solidity",
  "tiny-keccak",
 ]
@@ -263,9 +228,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.7"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
+checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
 
 [[package]]
 name = "anstyle-parse"
@@ -319,9 +284,9 @@ dependencies = [
  "include_dir",
  "itertools 0.10.5",
  "proc-macro-error",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -553,7 +518,7 @@ checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565"
 dependencies = [
  "num-bigint",
  "num-traits",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -655,7 +620,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -696,9 +661,9 @@ dependencies = [
 
 [[package]]
 name = "array-bytes"
-version = "6.2.3"
+version = "6.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d5dde061bd34119e902bbb2d9b90c5692635cf59fb91d582c2b68043f1b8293"
+checksum = "6f840fb7195bcfc5e17ea40c26e5ce6d5b9ce5d584466e17703209657e459ae0"
 
 [[package]]
 name = "arrayref"
@@ -759,7 +724,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "syn 1.0.109",
  "synstructure 0.12.6",
@@ -771,9 +736,9 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
  "synstructure 0.13.1",
 ]
 
@@ -783,7 +748,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -794,16 +759,16 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
 name = "assert_cmd"
-version = "2.0.15"
+version = "2.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc65048dd435533bb1baf2ed9956b9a278fbfdcf90301b39ee117f06c0199d37"
+checksum = "ed72493ac66d5804837f480ab3766c72bdfab91a65e565fc54fa9e42db0073a8"
 dependencies = [
  "anstyle",
  "bstr",
@@ -1214,14 +1179,14 @@ version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964"
 dependencies = [
- "async-lock 3.3.0",
+ "async-lock 3.4.0",
  "cfg-if",
  "concurrent-queue",
  "futures-io",
  "futures-lite 2.3.0",
  "parking",
  "polling 3.4.0",
- "rustix 0.38.25",
+ "rustix 0.38.21",
  "slab",
  "tracing",
  "windows-sys 0.52.0",
@@ -1238,13 +1203,13 @@ dependencies = [
 
 [[package]]
 name = "async-lock"
-version = "3.3.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b"
+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
 dependencies = [
- "event-listener 4.0.3",
+ "event-listener 5.2.0",
  "event-listener-strategy",
- "pin-project-lite 0.2.12",
+ "pin-project-lite",
 ]
 
 [[package]]
@@ -1298,7 +1263,7 @@ dependencies = [
  "log",
  "memchr",
  "once_cell",
- "pin-project-lite 0.2.12",
+ "pin-project-lite",
  "pin-utils",
  "slab",
  "wasm-bindgen-futures",
@@ -1312,7 +1277,7 @@ checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
 dependencies = [
  "async-stream-impl",
  "futures-core",
- "pin-project-lite 0.2.12",
+ "pin-project-lite",
 ]
 
 [[package]]
@@ -1321,9 +1286,9 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -1338,9 +1303,9 @@ version = "0.1.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -1353,7 +1318,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "memchr",
- "pin-project-lite 0.2.12",
+ "pin-project-lite",
 ]
 
 [[package]]
@@ -1397,7 +1362,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89"
 dependencies = [
  "proc-macro-error",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -1543,12 +1508,12 @@ dependencies = [
  "lazycell",
  "peeking_take_while",
  "prettyplease 0.2.12",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -2625,18 +2590,6 @@ dependencies = [
  "keystream",
 ]
 
-[[package]]
-name = "chacha20"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6"
-dependencies = [
- "cfg-if",
- "cipher 0.3.0",
- "cpufeatures",
- "zeroize",
-]
-
 [[package]]
 name = "chacha20"
 version = "0.9.1"
@@ -2650,14 +2603,14 @@ dependencies = [
 
 [[package]]
 name = "chacha20poly1305"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5"
+checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35"
 dependencies = [
- "aead 0.4.3",
- "chacha20 0.8.2",
- "cipher 0.3.0",
- "poly1305 0.7.2",
+ "aead",
+ "chacha20",
+ "cipher 0.4.4",
+ "poly1305",
  "zeroize",
 ]
 
@@ -2762,15 +2715,6 @@ dependencies = [
  "generic-array 0.14.7",
 ]
 
-[[package]]
-name = "cipher"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
-dependencies = [
- "generic-array 0.14.7",
-]
-
 [[package]]
 name = "cipher"
 version = "0.4.4"
@@ -2779,6 +2723,7 @@ checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
 dependencies = [
  "crypto-common",
  "inout",
+ "zeroize",
 ]
 
 [[package]]
@@ -2845,9 +2790,9 @@ dependencies = [
 
 [[package]]
 name = "clap-num"
-version = "1.1.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e063d263364859dc54fb064cedb7c122740cd4733644b14b176c097f51e8ab7"
+checksum = "488557e97528174edaa2ee268b23a809e0c598213a4bbcb4f34575a46fda147e"
 dependencies = [
  "num-traits",
 ]
@@ -2882,7 +2827,7 @@ checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008"
 dependencies = [
  "heck 0.4.1",
  "proc-macro-error",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -2894,9 +2839,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d029b67f89d30bbb547c89fd5161293c0aec155fc691d7924b64550662db93e"
 dependencies = [
  "heck 0.5.0",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -3082,7 +3027,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d51beaa537d73d2d1ff34ee70bc095f170420ab2ec5d687ecd3ec2b0d092514b"
 dependencies = [
  "nom",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -3095,19 +3040,20 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
 [[package]]
 name = "colored"
-version = "2.1.0"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8"
+checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6"
 dependencies = [
+ "is-terminal",
  "lazy_static",
  "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "combine"
-version = "4.6.7"
+version = "4.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
+checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
 dependencies = [
  "bytes",
  "memchr",
@@ -3666,9 +3612,9 @@ dependencies = [
 
 [[package]]
 name = "crc"
-version = "3.2.1"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636"
+checksum = "c2b432c56615136f8dba245fed7ec3d5518c500a31108661067e61e72fe7e6bc"
 dependencies = [
  "crc-catalog",
 ]
@@ -3818,15 +3764,6 @@ dependencies = [
  "subtle 2.5.0",
 ]
 
-[[package]]
-name = "ctr"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a232f92a03f37dd7d7dd2adc67166c77e9cd88de5b019b9a9eecfaeaf7bfd481"
-dependencies = [
- "cipher 0.3.0",
-]
-
 [[package]]
 name = "ctr"
 version = "0.9.2"
@@ -4213,9 +4150,9 @@ name = "cumulus-pallet-parachain-system-proc-macro"
 version = "0.6.0"
 dependencies = [
  "proc-macro-crate 3.1.0",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -4712,9 +4649,9 @@ dependencies = [
 
 [[package]]
 name = "curl-sys"
-version = "0.4.73+curl-8.8.0"
+version = "0.4.72+curl-8.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "450ab250ecf17227c39afb9a2dd9261dc0035cb80f2612472fc0c4aac2dcb84d"
+checksum = "29cbdc8314c447d11e8fd156dcdd031d9e02a7a976163e396b548c03153bc9ea"
 dependencies = [
  "cc",
  "libc",
@@ -4748,9 +4685,9 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -4787,10 +4724,10 @@ dependencies = [
  "cc",
  "codespan-reporting",
  "once_cell",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "scratch",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -4805,9 +4742,9 @@ version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "50c49547d73ba8dcfd4ad7325d64c6d5391ff4224d498fc39a6f3f49825a530d"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -4898,9 +4835,12 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.3.8"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+]
 
 [[package]]
 name = "derivative"
@@ -4908,7 +4848,7 @@ version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -4919,9 +4859,9 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -4930,9 +4870,9 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -4942,7 +4882,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
 dependencies = [
  "convert_case",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "rustc_version 0.4.0",
  "syn 1.0.109",
@@ -5038,9 +4978,9 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -5098,10 +5038,10 @@ dependencies = [
  "common-path",
  "derive-syn-parse",
  "once_cell",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "regex",
- "syn 2.0.58",
+ "syn 2.0.61",
  "termcolor",
  "toml 0.8.8",
  "walkdir",
@@ -5147,7 +5087,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -5293,7 +5233,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116"
 dependencies = [
  "heck 0.4.1",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -5305,9 +5245,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a"
 dependencies = [
  "heck 0.4.1",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -5325,9 +5265,9 @@ version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -5336,9 +5276,9 @@ version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fd000fd6988e73bbe993ea3db9b1aa64906ab88766d654973924340c8cddb42"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -5414,12 +5354,11 @@ dependencies = [
 
 [[package]]
 name = "erased-serde"
-version = "0.4.5"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d"
+checksum = "2b73807008a3c7f171cc40312f37d95ef0396e048b5848d775f54b1a4dd4a0d3"
 dependencies = [
  "serde",
- "typeid",
 ]
 
 [[package]]
@@ -5502,23 +5441,23 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
 name = "event-listener"
-version = "4.0.3"
+version = "5.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e"
+checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91"
 dependencies = [
  "concurrent-queue",
  "parking",
- "pin-project-lite 0.2.12",
+ "pin-project-lite",
 ]
 
 [[package]]
 name = "event-listener-strategy"
-version = "0.4.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3"
+checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
 dependencies = [
- "event-listener 4.0.3",
- "pin-project-lite 0.2.12",
+ "event-listener 5.2.0",
+ "pin-project-lite",
 ]
 
 [[package]]
@@ -5540,9 +5479,9 @@ dependencies = [
  "file-guard",
  "fs-err",
  "prettyplease 0.2.12",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -5612,9 +5551,9 @@ dependencies = [
  "expander",
  "indexmap 2.2.3",
  "proc-macro-crate 3.1.0",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -5815,9 +5754,9 @@ dependencies = [
 
 [[package]]
 name = "form_urlencoded"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
 dependencies = [
  "percent-encoding",
 ]
@@ -5944,11 +5883,11 @@ dependencies = [
  "frame-support",
  "parity-scale-codec",
  "proc-macro-crate 3.1.0",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "scale-info",
  "sp-arithmetic",
- "syn 2.0.58",
+ "syn 2.0.61",
  "trybuild",
 ]
 
@@ -6139,7 +6078,7 @@ dependencies = [
  "parity-scale-codec",
  "pretty_assertions",
  "proc-macro-warning 1.0.0",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "regex",
  "scale-info",
@@ -6149,7 +6088,7 @@ dependencies = [
  "sp-metadata-ir",
  "sp-runtime",
  "static_assertions",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -6158,18 +6097,18 @@ version = "10.0.0"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate 3.1.0",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "11.0.0"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -6312,7 +6251,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29f9df8a11882c4e3335eb2d18a0137c505d9ca927470b0cac9c6f0ae07d28f7"
 dependencies = [
- "rustix 0.38.25",
+ "rustix 0.38.21",
  "windows-sys 0.48.0",
 ]
 
@@ -6398,7 +6337,7 @@ dependencies = [
  "futures-io",
  "memchr",
  "parking",
- "pin-project-lite 0.2.12",
+ "pin-project-lite",
  "waker-fn",
 ]
 
@@ -6409,7 +6348,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
 dependencies = [
  "futures-core",
- "pin-project-lite 0.2.12",
+ "pin-project-lite",
 ]
 
 [[package]]
@@ -6418,9 +6357,9 @@ version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -6464,7 +6403,7 @@ dependencies = [
  "futures-sink",
  "futures-task",
  "memchr",
- "pin-project-lite 0.2.12",
+ "pin-project-lite",
  "pin-utils",
  "slab",
 ]
@@ -6542,16 +6481,6 @@ dependencies = [
  "rand_core",
 ]
 
-[[package]]
-name = "ghash"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99"
-dependencies = [
- "opaque-debug 0.3.0",
- "polyval 0.5.3",
-]
-
 [[package]]
 name = "ghash"
 version = "0.5.0"
@@ -6559,7 +6488,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40"
 dependencies = [
  "opaque-debug 0.3.0",
- "polyval 0.6.1",
+ "polyval",
 ]
 
 [[package]]
@@ -6677,9 +6606,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.24"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9"
+checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
 dependencies = [
  "bytes",
  "fnv",
@@ -6830,9 +6759,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-conservative"
-version = "0.1.2"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "212ab92002354b4819390025006c897e8140934349e8635c9b077f47b4dcbd20"
+checksum = "30ed443af458ccb6d81c1e7e661545f94d3176752fb1df2f543b902a1e0f51e2"
 
 [[package]]
 name = "hex-literal"
@@ -6932,7 +6861,7 @@ checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
 dependencies = [
  "bytes",
  "http 0.2.9",
- "pin-project-lite 0.2.12",
+ "pin-project-lite",
 ]
 
 [[package]]
@@ -6955,7 +6884,7 @@ dependencies = [
  "futures-util",
  "http 1.1.0",
  "http-body 1.0.0",
- "pin-project-lite 0.2.12",
+ "pin-project-lite",
 ]
 
 [[package]]
@@ -6978,21 +6907,21 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.30"
+version = "0.14.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9"
+checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.3.24",
+ "h2 0.3.26",
  "http 0.2.9",
  "http-body 0.4.5",
  "httparse",
  "httpdate",
  "itoa",
- "pin-project-lite 0.2.12",
+ "pin-project-lite",
  "socket2 0.5.7",
  "tokio",
  "tower-service",
@@ -7015,7 +6944,7 @@ dependencies = [
  "httparse",
  "httpdate",
  "itoa",
- "pin-project-lite 0.2.12",
+ "pin-project-lite",
  "smallvec",
  "tokio",
  "want",
@@ -7029,7 +6958,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
 dependencies = [
  "futures-util",
  "http 0.2.9",
- "hyper 0.14.30",
+ "hyper 0.14.29",
  "log",
  "rustls 0.21.7",
  "rustls-native-certs 0.6.3",
@@ -7067,7 +6996,7 @@ dependencies = [
  "http 1.1.0",
  "http-body 1.0.0",
  "hyper 1.3.1",
- "pin-project-lite 0.2.12",
+ "pin-project-lite",
  "socket2 0.5.7",
  "tokio",
  "tower",
@@ -7119,6 +7048,16 @@ dependencies = [
  "unicode-normalization",
 ]
 
+[[package]]
+name = "idna"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
 [[package]]
 name = "if-addrs"
 version = "0.10.2"
@@ -7159,7 +7098,7 @@ dependencies = [
  "bytes",
  "futures",
  "http 0.2.9",
- "hyper 0.14.30",
+ "hyper 0.14.29",
  "log",
  "rand",
  "tokio",
@@ -7211,7 +7150,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -7231,7 +7170,7 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
 ]
 
@@ -7356,7 +7295,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
  "hermit-abi 0.3.2",
- "rustix 0.38.25",
+ "rustix 0.38.21",
  "windows-sys 0.48.0",
 ]
 
@@ -7575,9 +7514,9 @@ checksum = "7895f186d5921065d96e16bd795e5ca89ac8356ec423fafc6e3d7cf8ec11aee4"
 dependencies = [
  "heck 0.5.0",
  "proc-macro-crate 3.1.0",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -7826,9 +7765,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
 
 [[package]]
 name = "libnghttp2-sys"
-version = "0.1.10+1.61.0"
+version = "0.1.9+1.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "959c25552127d2e1fa72f0e52548ec04fc386e827ba71a7bd01db46a447dc135"
+checksum = "b57e858af2798e167e709b9d969325b6d8e9d50232fcbc494d7d54f976854a64"
 dependencies = [
  "cc",
  "libc",
@@ -8163,9 +8102,9 @@ checksum = "c4d5ec2a3df00c7836d7696c136274c9c59705bac69133253696a6c932cd1d74"
 dependencies = [
  "heck 0.4.1",
  "proc-macro-warning 0.4.2",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -8236,9 +8175,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-websocket"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3facf0691bab65f571bc97c6c65ffa836248ca631d631b7691ac91deb7fceb5f"
+checksum = "004ee9c4a4631435169aee6aad2f62e3984dc031c43b6d29731e8e82a016c538"
 dependencies = [
  "either",
  "futures",
@@ -8247,9 +8186,10 @@ dependencies = [
  "libp2p-identity",
  "log",
  "parking_lot 0.12.3",
- "quicksink",
+ "pin-project-lite",
  "rw-stream-sink",
- "soketto 0.7.1",
+ "soketto 0.8.0",
+ "thiserror",
  "url",
  "webpki-roots 0.25.2",
 ]
@@ -8389,9 +8329,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.11"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829"
+checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
 
 [[package]]
 name = "lioness"
@@ -8452,7 +8392,7 @@ dependencies = [
  "rand",
  "rcgen",
  "ring 0.16.20",
- "rustls 0.20.8",
+ "rustls 0.20.9",
  "serde",
  "sha2 0.10.8",
  "simple-dns",
@@ -8578,7 +8518,7 @@ dependencies = [
  "macro_magic_core",
  "macro_magic_macros",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -8590,9 +8530,9 @@ dependencies = [
  "const-random",
  "derive-syn-parse",
  "macro_magic_core_macros",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -8601,9 +8541,9 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b02abfe41815b5bd98dbd4260173db2c116dda171dc0fe7838cb206333b83308"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -8614,7 +8554,7 @@ checksum = "73ea28ee64b88876bf45277ed9a5817c1817df061a74f2b988971a12570e5869"
 dependencies = [
  "macro_magic_core",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -8665,9 +8605,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.6.4"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memfd"
@@ -8789,19 +8729,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
-[[package]]
-name = "minimal-template"
-version = "0.0.0"
-dependencies = [
- "docify",
- "minimal-template-node",
- "minimal-template-runtime",
- "pallet-minimal-template",
- "polkadot-sdk-docs",
- "polkadot-sdk-frame",
- "simple-mermaid 0.1.1",
-]
-
 [[package]]
 name = "minimal-template-node"
 version = "0.0.0"
@@ -8976,7 +8903,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb"
 dependencies = [
  "cfg-if",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -8988,9 +8915,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2"
 dependencies = [
  "cfg-if",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -9100,7 +9027,7 @@ checksum = "fc076939022111618a5026d3be019fd8b366e76314538ff9a1b59ffbcbf98bcd"
 dependencies = [
  "proc-macro-crate 1.3.1",
  "proc-macro-error",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "syn 1.0.109",
  "synstructure 0.12.6",
@@ -9148,7 +9075,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -9237,9 +9164,9 @@ dependencies = [
 
 [[package]]
 name = "network-interface"
-version = "1.1.4"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a43439bf756eed340bdf8feba761e2d50c7d47175d87545cd5cbe4a137c4d1"
+checksum = "ae72fd9dbd7f55dda80c00d66acc3b2130436fcba9ea89118fc508eaae48dfb0"
 dependencies = [
  "cc",
  "libc",
@@ -9528,15 +9455,21 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
 [[package]]
 name = "num-derive"
 version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -9701,9 +9634,9 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -9714,9 +9647,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-src"
-version = "300.3.1+3.3.1"
+version = "300.2.3+3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91"
+checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843"
 dependencies = [
  "cc",
 ]
@@ -9768,7 +9701,7 @@ dependencies = [
  "itertools 0.11.0",
  "petgraph",
  "proc-macro-crate 3.1.0",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -10135,6 +10068,7 @@ version = "28.0.0"
 dependencies = [
  "array-bytes",
  "binary-merkle-tree",
+ "frame-benchmarking",
  "frame-support",
  "frame-system",
  "log",
@@ -10471,9 +10405,9 @@ dependencies = [
 name = "pallet-contracts-proc-macro"
 version = "18.0.0"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -10542,6 +10476,7 @@ dependencies = [
  "frame-election-provider-support",
  "frame-support",
  "frame-system",
+ "log",
  "pallet-balances",
  "pallet-nomination-pools",
  "pallet-staking",
@@ -10639,7 +10574,7 @@ dependencies = [
  "sp-npos-elections",
  "sp-runtime",
  "sp-tracing 16.0.0",
- "strum 0.26.3",
+ "strum 0.26.2",
 ]
 
 [[package]]
@@ -11705,10 +11640,10 @@ name = "pallet-staking-reward-curve"
 version = "11.0.0"
 dependencies = [
  "proc-macro-crate 3.1.0",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "sp-runtime",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -12350,7 +12285,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c"
 dependencies = [
  "proc-macro-crate 3.1.0",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -12379,7 +12314,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "syn 1.0.109",
  "synstructure 0.12.6",
 ]
@@ -12765,9 +12700,9 @@ dependencies = [
 
 [[package]]
 name = "percent-encoding"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pest"
@@ -12797,9 +12732,9 @@ checksum = "68ca01446f50dbda87c1786af8770d535423fa8a53aec03b8f4e3d7eb10e0929"
 dependencies = [
  "pest",
  "pest_meta",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -12838,22 +12773,16 @@ version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777"
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.12"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 
 [[package]]
 name = "pin-utils"
@@ -13755,7 +13684,7 @@ dependencies = [
  "sc-network",
  "sc-network-types",
  "sp-runtime",
- "strum 0.26.3",
+ "strum 0.26.2",
  "thiserror",
  "tracing-gum",
 ]
@@ -14623,6 +14552,7 @@ dependencies = [
  "pallet-balances",
  "pallet-broker",
  "pallet-collective",
+ "pallet-contracts",
  "pallet-default-config-example",
  "pallet-democracy",
  "pallet-example-offchain-worker",
@@ -14955,7 +14885,7 @@ dependencies = [
  "sp-runtime",
  "sp-timestamp",
  "sp-tracing 16.0.0",
- "strum 0.26.3",
+ "strum 0.26.2",
  "substrate-prometheus-endpoint",
  "tokio",
  "tracing-gum",
@@ -15191,9 +15121,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c4fdfc49717fb9a196e74a5d28e0bc764eb394a2c803eb11133a31ac996c60c"
 dependencies = [
  "polkavm-common",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -15203,7 +15133,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ba81f7b5faac81e528eb6158a6f3c9e0bb1008e0ffa19653bc8dea925ecb429"
 dependencies = [
  "polkavm-derive-impl",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -15239,7 +15169,7 @@ dependencies = [
  "concurrent-queue",
  "libc",
  "log",
- "pin-project-lite 0.2.12",
+ "pin-project-lite",
  "windows-sys 0.48.0",
 ]
 
@@ -15251,23 +15181,12 @@ checksum = "30054e72317ab98eddd8561db0f6524df3367636884b7b21b703e4b280a84a14"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
- "pin-project-lite 0.2.12",
- "rustix 0.38.25",
+ "pin-project-lite",
+ "rustix 0.38.21",
  "tracing",
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "poly1305"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede"
-dependencies = [
- "cpufeatures",
- "opaque-debug 0.3.0",
- "universal-hash 0.4.0",
-]
-
 [[package]]
 name = "poly1305"
 version = "0.8.0"
@@ -15276,19 +15195,7 @@ checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf"
 dependencies = [
  "cpufeatures",
  "opaque-debug 0.3.0",
- "universal-hash 0.5.1",
-]
-
-[[package]]
-name = "polyval"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "opaque-debug 0.3.0",
- "universal-hash 0.4.0",
+ "universal-hash",
 ]
 
 [[package]]
@@ -15300,7 +15207,7 @@ dependencies = [
  "cfg-if",
  "cpufeatures",
  "opaque-debug 0.3.0",
- "universal-hash 0.5.1",
+ "universal-hash",
 ]
 
 [[package]]
@@ -15318,6 +15225,12 @@ dependencies = [
  "rand",
 ]
 
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
 [[package]]
 name = "pprof"
 version = "0.12.1"
@@ -15402,7 +15315,7 @@ version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "syn 1.0.109",
 ]
 
@@ -15412,8 +15325,8 @@ version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62"
 dependencies = [
- "proc-macro2 1.0.75",
- "syn 2.0.58",
+ "proc-macro2 1.0.82",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -15473,7 +15386,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
  "proc-macro-error-attr",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "syn 1.0.109",
  "version_check",
@@ -15485,7 +15398,7 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "version_check",
 ]
@@ -15502,9 +15415,9 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -15513,9 +15426,9 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b698b0b09d40e9b7c1a47b132d66a8b54bcd20583d9b6d06e4535e383b4405c"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -15529,9 +15442,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.75"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
@@ -15548,7 +15461,7 @@ dependencies = [
  "hex",
  "lazy_static",
  "procfs-core",
- "rustix 0.38.25",
+ "rustix 0.38.21",
 ]
 
 [[package]]
@@ -15594,9 +15507,9 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -15675,9 +15588,9 @@ dependencies = [
 
 [[package]]
 name = "prost-build"
-version = "0.12.6"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"
+checksum = "80b776a1b2dc779f5ee0641f8ade0125bc1298dd41a9a0c16d8bd57b42d222b1"
 dependencies = [
  "bytes",
  "heck 0.5.0",
@@ -15688,9 +15601,9 @@ dependencies = [
  "petgraph",
  "prettyplease 0.2.12",
  "prost 0.12.6",
- "prost-types 0.12.6",
+ "prost-types 0.12.4",
  "regex",
- "syn 2.0.58",
+ "syn 2.0.61",
  "tempfile",
 ]
 
@@ -15702,7 +15615,7 @@ checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
 dependencies = [
  "anyhow",
  "itertools 0.10.5",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -15715,9 +15628,9 @@ checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
 dependencies = [
  "anyhow",
  "itertools 0.11.0",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -15731,9 +15644,9 @@ dependencies = [
 
 [[package]]
 name = "prost-types"
-version = "0.12.6"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0"
+checksum = "3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe"
 dependencies = [
  "prost 0.12.6",
 ]
@@ -15843,17 +15756,6 @@ dependencies = [
  "rand",
 ]
 
-[[package]]
-name = "quicksink"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77de3c815e5a160b1539c6592796801df2043ae35e123b46d73380cfa57af858"
-dependencies = [
- "futures-core",
- "futures-sink",
- "pin-project-lite 0.1.12",
-]
-
 [[package]]
 name = "quinn"
 version = "0.9.4"
@@ -15861,11 +15763,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e8b432585672228923edbbf64b8b12c14e1112f62e88737655b4a083dbcd78e"
 dependencies = [
  "bytes",
- "pin-project-lite 0.2.12",
- "quinn-proto 0.9.5",
+ "pin-project-lite",
+ "quinn-proto 0.9.6",
  "quinn-udp 0.3.2",
  "rustc-hash",
- "rustls 0.20.8",
+ "rustls 0.20.9",
  "thiserror",
  "tokio",
  "tracing",
@@ -15880,7 +15782,7 @@ checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75"
 dependencies = [
  "bytes",
  "futures-io",
- "pin-project-lite 0.2.12",
+ "pin-project-lite",
  "quinn-proto 0.10.6",
  "quinn-udp 0.4.1",
  "rustc-hash",
@@ -15892,15 +15794,15 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.9.5"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c956be1b23f4261676aed05a0046e204e8a6836e50203902683a718af0797989"
+checksum = "94b0b33c13a79f669c85defaf4c275dc86a0c0372807d0ca3d78e0bb87274863"
 dependencies = [
  "bytes",
  "rand",
  "ring 0.16.20",
  "rustc-hash",
- "rustls 0.20.8",
+ "rustls 0.20.9",
  "slab",
  "thiserror",
  "tinyvec",
@@ -15932,7 +15834,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4"
 dependencies = [
  "libc",
- "quinn-proto 0.9.5",
+ "quinn-proto 0.9.6",
  "socket2 0.4.9",
  "tracing",
  "windows-sys 0.42.0",
@@ -15966,7 +15868,7 @@ version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
 ]
 
 [[package]]
@@ -16165,9 +16067,9 @@ version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -16343,10 +16245,10 @@ dependencies = [
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2 0.3.24",
+ "h2 0.3.26",
  "http 0.2.9",
  "http-body 0.4.5",
- "hyper 0.14.30",
+ "hyper 0.14.29",
  "hyper-rustls 0.24.2",
  "ipnet",
  "js-sys",
@@ -16354,7 +16256,7 @@ dependencies = [
  "mime",
  "once_cell",
  "percent-encoding",
- "pin-project-lite 0.2.12",
+ "pin-project-lite",
  "rustls 0.21.7",
  "rustls-pemfile 1.0.3",
  "serde",
@@ -16715,12 +16617,12 @@ checksum = "d428f8247852f894ee1be110b375111b586d4fa431f6c46e64ba5a0dcccbe605"
 dependencies = [
  "cfg-if",
  "glob",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "regex",
  "relative-path",
  "rustc_version 0.4.0",
- "syn 2.0.58",
+ "syn 2.0.61",
  "unicode-ident",
 ]
 
@@ -16863,22 +16765,22 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.25"
+version = "0.38.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e"
+checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3"
 dependencies = [
  "bitflags 2.6.0",
  "errno",
  "libc",
- "linux-raw-sys 0.4.11",
+ "linux-raw-sys 0.4.10",
  "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.20.8"
+version = "0.20.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f"
+checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99"
 dependencies = [
  "ring 0.16.20",
  "sct",
@@ -16964,9 +16866,9 @@ checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
 
 [[package]]
 name = "rustls-platform-verifier"
-version = "0.3.2"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e3beb939bcd33c269f4bf946cc829fcd336370267c4a927ac0399c84a3151a1"
+checksum = "b5f0d26fa1ce3c790f9590868f0109289a044acb954525f933e2aa3b871c157d"
 dependencies = [
  "core-foundation",
  "core-foundation-sys",
@@ -17107,7 +17009,7 @@ dependencies = [
  "multihash 0.19.1",
  "parity-scale-codec",
  "prost 0.12.6",
- "prost-build 0.12.6",
+ "prost-build 0.12.4",
  "quickcheck",
  "rand",
  "sc-client-api",
@@ -17203,9 +17105,9 @@ name = "sc-chain-spec-derive"
 version = "11.0.0"
 dependencies = [
  "proc-macro-crate 3.1.0",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -17853,7 +17755,7 @@ dependencies = [
  "partial_sort",
  "pin-project",
  "prost 0.12.6",
- "prost-build 0.12.6",
+ "prost-build 0.12.4",
  "rand",
  "sc-block-builder",
  "sc-client-api",
@@ -17898,7 +17800,7 @@ dependencies = [
  "futures",
  "libp2p-identity",
  "parity-scale-codec",
- "prost-build 0.12.6",
+ "prost-build 0.12.4",
  "sc-consensus",
  "sc-network-types",
  "sp-consensus",
@@ -17940,7 +17842,7 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "prost 0.12.6",
- "prost-build 0.12.6",
+ "prost-build 0.12.4",
  "sc-client-api",
  "sc-network",
  "sc-network-types",
@@ -17984,7 +17886,7 @@ dependencies = [
  "mockall 0.11.4",
  "parity-scale-codec",
  "prost 0.12.6",
- "prost-build 0.12.6",
+ "prost-build 0.12.4",
  "quickcheck",
  "sc-block-builder",
  "sc-client-api",
@@ -18086,7 +17988,7 @@ dependencies = [
  "fnv",
  "futures",
  "futures-timer",
- "hyper 0.14.30",
+ "hyper 0.14.29",
  "hyper-rustls 0.24.2",
  "lazy_static",
  "log",
@@ -18498,9 +18400,9 @@ name = "sc-tracing-proc-macro"
 version = "11.0.0"
 dependencies = [
  "proc-macro-crate 3.1.0",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -18612,7 +18514,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d35494501194174bda522a32605929eefc9ecf7e0a326c26db1fdd85881eb62"
 dependencies = [
  "proc-macro-crate 3.1.0",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -18650,7 +18552,7 @@ version = "0.8.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0f696e21e10fa546b7ffb1c9672c6de8fbc7a81acf59524386d8639bf12737"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "serde_derive_internals",
  "syn 1.0.109",
@@ -18689,7 +18591,7 @@ version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8de18f6d8ba0aad7045f5feae07ec29899c1112584a38509a84ad7b04451eaa0"
 dependencies = [
- "aead 0.5.2",
+ "aead",
  "arrayref",
  "arrayvec 0.7.4",
  "curve25519-dalek",
@@ -18771,18 +18673,18 @@ dependencies = [
 
 [[package]]
 name = "secp256k1"
-version = "0.28.0"
+version = "0.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2acea373acb8c21ecb5a23741452acd2593ed44ee3d343e72baaa143bc89d0d5"
+checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10"
 dependencies = [
  "secp256k1-sys",
 ]
 
 [[package]]
 name = "secp256k1-sys"
-version = "0.9.0"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09e67c467c38fd24bd5499dc9a18183b31575c12ee549197e3e20d57aa4fe3b7"
+checksum = "e5d1746aae42c19d583c3c1a8c646bfad910498e2051c551a7f2e3c0c9fbb7eb"
 dependencies = [
  "cc",
 ]
@@ -18950,9 +18852,9 @@ version = "1.0.206"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fabfb6138d2383ea8208cf98ccf69cdfb1aff4088460681d84189aa259762f97"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -18961,7 +18863,7 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -19011,9 +18913,9 @@ dependencies = [
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.32"
+version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fd075d994154d4a774f95b51fb96bdc2832b0ea48425c92546073816cda1f2f"
+checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
  "indexmap 2.2.3",
  "itoa",
@@ -19052,9 +18954,9 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -19095,9 +18997,9 @@ dependencies = [
 
 [[package]]
 name = "sha1-asm"
-version = "0.5.3"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "286acebaf8b67c1130aedffad26f594eff0c1292389158135327d2e23aed582b"
+checksum = "2ba6947745e7f86be3b8af00b7355857085dbdf8901393c89514510eb61f4e21"
 dependencies = [
  "cc",
 ]
@@ -19345,7 +19247,7 @@ dependencies = [
  "bip39",
  "blake2-rfc",
  "bs58 0.5.1",
- "chacha20 0.9.1",
+ "chacha20",
  "crossbeam-queue",
  "derive_more",
  "ed25519-zebra",
@@ -19367,7 +19269,7 @@ dependencies = [
  "num-traits",
  "pbkdf2",
  "pin-project",
- "poly1305 0.8.0",
+ "poly1305",
  "rand",
  "rand_chacha",
  "ruzstd",
@@ -19430,16 +19332,16 @@ checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831"
 
 [[package]]
 name = "snow"
-version = "0.9.3"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c9d1425eb528a21de2755c75af4c9b5d57f50a0d4c3b7f1828a4cd03f8ba155"
+checksum = "850948bee068e713b8ab860fe1adc4d109676ab4c3b621fd8147f06b261f2f85"
 dependencies = [
- "aes-gcm 0.9.2",
+ "aes-gcm",
  "blake2 0.10.6",
  "chacha20poly1305",
  "curve25519-dalek",
  "rand_core",
- "ring 0.16.20",
+ "ring 0.17.7",
  "rustc_version 0.4.0",
  "sha2 0.10.8",
  "subtle 2.5.0",
@@ -19928,9 +19830,9 @@ dependencies = [
  "blake2 0.10.6",
  "expander",
  "proc-macro-crate 3.1.0",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -20126,7 +20028,8 @@ dependencies = [
  "sp-keystore",
  "sp-mmr-primitives",
  "sp-runtime",
- "strum 0.26.3",
+ "sp-weights",
+ "strum 0.26.2",
  "w3f-bls",
 ]
 
@@ -20257,7 +20160,7 @@ dependencies = [
 [[package]]
 name = "sp-crypto-ec-utils"
 version = "0.4.1"
-source = "git+https://github.com/paritytech/polkadot-sdk#838a534da874cf6071fba1df07643c6c5b033ae0"
+source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f"
 dependencies = [
  "ark-bls12-377",
  "ark-bls12-377-ext",
@@ -20314,7 +20217,7 @@ version = "0.1.0"
 dependencies = [
  "quote 1.0.36",
  "sp-crypto-hashing",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -20330,18 +20233,18 @@ name = "sp-debug-derive"
 version = "8.0.0"
 source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
 name = "sp-debug-derive"
 version = "14.0.0"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -20419,7 +20322,7 @@ version = "31.0.0"
 dependencies = [
  "sp-core",
  "sp-runtime",
- "strum 0.26.3",
+ "strum 0.26.2",
 ]
 
 [[package]]
@@ -20607,13 +20510,13 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#838a534da874cf6071fba1df07643c6c5b033ae0"
+source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f"
 dependencies = [
  "Inflector",
  "proc-macro-crate 1.3.1",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -20623,9 +20526,9 @@ dependencies = [
  "Inflector",
  "expander",
  "proc-macro-crate 3.1.0",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -20718,7 +20621,7 @@ dependencies = [
 name = "sp-statement-store"
 version = "10.0.0"
 dependencies = [
- "aes-gcm 0.10.3",
+ "aes-gcm",
  "curve25519-dalek",
  "ed25519-dalek",
  "hkdf",
@@ -20884,10 +20787,10 @@ name = "sp-version-proc-macro"
 version = "13.0.0"
 dependencies = [
  "parity-scale-codec",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "sp-version",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -20969,7 +20872,7 @@ checksum = "5e6915280e2d0db8911e5032a5c275571af6bdded2916abd691a659be25d3439"
 dependencies = [
  "Inflector",
  "num-format",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "serde",
  "serde_json",
@@ -20994,7 +20897,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f07d54c4d01a1713eb363b55ba51595da15f6f1211435b71466460da022aa140"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -21187,7 +21090,7 @@ checksum = "70a2595fc3aa78f2d0e45dd425b22282dd863273761cc77780914b2cf3003acf"
 dependencies = [
  "cfg_aliases",
  "memchr",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -21260,7 +21163,7 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
 dependencies = [
  "heck 0.3.3",
  "proc-macro-error",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -21282,11 +21185,11 @@ checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
 
 [[package]]
 name = "strum"
-version = "0.26.3"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
+checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29"
 dependencies = [
- "strum_macros 0.26.4",
+ "strum_macros 0.26.2",
 ]
 
 [[package]]
@@ -21296,7 +21199,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
 dependencies = [
  "heck 0.4.1",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "rustversion",
  "syn 1.0.109",
@@ -21309,23 +21212,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
 dependencies = [
  "heck 0.4.1",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "rustversion",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
 name = "strum_macros"
-version = "0.26.4"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
+checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946"
 dependencies = [
- "heck 0.5.0",
- "proc-macro2 1.0.75",
+ "heck 0.4.1",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "rustversion",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -21463,7 +21366,7 @@ dependencies = [
  "sp-runtime",
  "sp-trie",
  "structopt",
- "strum 0.26.3",
+ "strum 0.26.2",
  "thiserror",
 ]
 
@@ -21639,7 +21542,7 @@ dependencies = [
  "sp-maybe-compressed-blob",
  "sp-tracing 16.0.0",
  "sp-version",
- "strum 0.26.3",
+ "strum 0.26.2",
  "tempfile",
  "toml 0.8.8",
  "walkdir",
@@ -21772,18 +21675,18 @@ version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "unicode-ident",
 ]
 
 [[package]]
 name = "syn"
-version = "2.0.58"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "unicode-ident",
 ]
@@ -21795,9 +21698,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "86b837ef12ab88835251726eb12237655e61ec8dc8a280085d1961cdc3dfd047"
 dependencies = [
  "paste",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -21806,7 +21709,7 @@ version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "syn 1.0.109",
  "unicode-xid 0.2.4",
@@ -21818,16 +21721,16 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
 name = "sysinfo"
-version = "0.30.12"
+version = "0.30.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae"
+checksum = "1fb4f3438c8f6389c864e61221cbc97e9bca98b4daf39a5beb7bea660f528bb2"
 dependencies = [
  "cfg-if",
  "core-foundation-sys",
@@ -21891,7 +21794,7 @@ dependencies = [
  "cfg-if",
  "fastrand 2.1.0",
  "redox_syscall 0.4.1",
- "rustix 0.38.25",
+ "rustix 0.38.21",
  "windows-sys 0.48.0",
 ]
 
@@ -21910,7 +21813,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
 dependencies = [
- "rustix 0.38.25",
+ "rustix 0.38.21",
  "windows-sys 0.48.0",
 ]
 
@@ -21937,9 +21840,9 @@ version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -22101,7 +22004,7 @@ version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "10ac1c5050e43014d16b2f94d0d2ce79e65ffdd8b38d8048f9c8f6a8a6da62ac"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -22112,9 +22015,9 @@ version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -22188,14 +22091,16 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.27"
+version = "0.3.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
 dependencies = [
  "deranged",
  "itoa",
  "libc",
+ "num-conv",
  "num_threads",
+ "powerfmt",
  "serde",
  "time-core",
  "time-macros",
@@ -22203,16 +22108,17 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.13"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "733d258752e9303d392b94b75230d07b0b9c489350c69b851fc6c065fde3e8f9"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
 dependencies = [
+ "num-conv",
  "time-core",
 ]
 
@@ -22252,9 +22158,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.38.0"
+version = "1.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
+checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
 dependencies = [
  "backtrace",
  "bytes",
@@ -22262,7 +22168,7 @@ dependencies = [
  "mio",
  "num_cpus",
  "parking_lot 0.12.3",
- "pin-project-lite 0.2.12",
+ "pin-project-lite",
  "signal-hook-registry",
  "socket2 0.5.7",
  "tokio-macros",
@@ -22271,13 +22177,13 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.3.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -22319,7 +22225,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
 dependencies = [
  "futures-core",
- "pin-project-lite 0.2.12",
+ "pin-project-lite",
  "tokio",
  "tokio-util",
 ]
@@ -22362,7 +22268,7 @@ dependencies = [
  "futures-core",
  "futures-io",
  "futures-sink",
- "pin-project-lite 0.2.12",
+ "pin-project-lite",
  "tokio",
 ]
 
@@ -22429,7 +22335,7 @@ dependencies = [
  "futures-core",
  "futures-util",
  "pin-project",
- "pin-project-lite 0.2.12",
+ "pin-project-lite",
  "tokio",
  "tower-layer",
  "tower-service",
@@ -22447,7 +22353,7 @@ dependencies = [
  "http 1.1.0",
  "http-body 1.0.0",
  "http-body-util",
- "pin-project-lite 0.2.12",
+ "pin-project-lite",
  "tower-layer",
  "tower-service",
 ]
@@ -22471,7 +22377,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
  "log",
- "pin-project-lite 0.2.12",
+ "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
 ]
@@ -22482,9 +22388,9 @@ version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -22524,9 +22430,9 @@ dependencies = [
  "assert_matches",
  "expander",
  "proc-macro-crate 3.1.0",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -22789,12 +22695,6 @@ dependencies = [
  "static_assertions",
 ]
 
-[[package]]
-name = "typeid"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "059d83cc991e7a42fc37bd50941885db0888e34209f8cfd9aab07ddec03bc9cf"
-
 [[package]]
 name = "typenum"
 version = "1.16.0"
@@ -22870,16 +22770,6 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
-[[package]]
-name = "universal-hash"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8326b2c654932e3e4f9196e69d08fdf7cfd718e1dc6f66b347e6024a0c961402"
-dependencies = [
- "generic-array 0.14.7",
- "subtle 2.5.0",
-]
-
 [[package]]
 name = "universal-hash"
 version = "0.5.1"
@@ -22892,9 +22782,9 @@ dependencies = [
 
 [[package]]
 name = "unsafe-libyaml"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b"
+checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
 
 [[package]]
 name = "unsigned-varint"
@@ -22932,12 +22822,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.4.0"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
 dependencies = [
  "form_urlencoded",
- "idna 0.4.0",
+ "idna 0.5.0",
  "percent-encoding",
 ]
 
@@ -22967,9 +22857,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
 [[package]]
 name = "value-bag"
-version = "1.9.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101"
+checksum = "8fec26a25bd6fca441cdd0f769fd7f891bae119f996de31f86a5eddccef54c1d"
 dependencies = [
  "value-bag-serde1",
  "value-bag-sval2",
@@ -22977,9 +22867,9 @@ dependencies = [
 
 [[package]]
 name = "value-bag-serde1"
-version = "1.9.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccacf50c5cb077a9abb723c5bcb5e0754c1a433f1e1de89edc328e2760b6328b"
+checksum = "ead5b693d906686203f19a49e88c477fb8c15798b68cf72f60b4b5521b4ad891"
 dependencies = [
  "erased-serde",
  "serde",
@@ -22988,9 +22878,9 @@ dependencies = [
 
 [[package]]
 name = "value-bag-sval2"
-version = "1.9.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1785bae486022dfb9703915d42287dcb284c1ee37bd1080eeba78cc04721285b"
+checksum = "3b9d0f4a816370c3a0d7d82d603b62198af17675b12fe5e91de6b47ceb505882"
 dependencies = [
  "sval",
  "sval_buffer",
@@ -23091,11 +22981,12 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.87"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
 dependencies = [
  "cfg-if",
+ "once_cell",
  "serde",
  "serde_json",
  "wasm-bindgen-macro",
@@ -23103,16 +22994,16 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.87"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
  "wasm-bindgen-shared",
 ]
 
@@ -23130,9 +23021,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.87"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
 dependencies = [
  "quote 1.0.36",
  "wasm-bindgen-macro-support",
@@ -23140,22 +23031,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.87"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.87"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
 
 [[package]]
 name = "wasm-bindgen-test"
@@ -23177,7 +23068,7 @@ version = "0.3.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ecb993dd8c836930ed130e020e77d9b2e65dd0fbab1b67c790b0f5d80b11a575"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
 ]
 
@@ -24243,10 +24134,10 @@ name = "xcm-procedural"
 version = "7.0.0"
 dependencies = [
  "Inflector",
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
  "staging-xcm",
- "syn 2.0.58",
+ "syn 2.0.61",
  "trybuild",
 ]
 
@@ -24409,9 +24300,9 @@ version = "0.7.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -24429,9 +24320,9 @@ version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
- "proc-macro2 1.0.75",
+ "proc-macro2 1.0.82",
  "quote 1.0.36",
- "syn 2.0.58",
+ "syn 2.0.61",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 74b12f96603a..ebe9dc0dab3e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -522,7 +522,6 @@ members = [
 	"substrate/utils/prometheus",
 	"substrate/utils/substrate-bip39",
 	"substrate/utils/wasm-builder",
-	"templates/minimal",
 	"templates/minimal/node",
 	"templates/minimal/pallets/template",
 	"templates/minimal/runtime",
@@ -1319,7 +1318,7 @@ tracing-log = { version = "0.2.0" }
 tracing-subscriber = { version = "0.3.18" }
 tracking-allocator = { path = "polkadot/node/tracking-allocator", default-features = false, package = "staging-tracking-allocator" }
 trie-bench = { version = "0.39.0" }
-trie-db = { version = "0.29.0", default-features = false }
+trie-db = { version = "0.29.1", default-features = false }
 trie-root = { version = "0.18.0", default-features = false }
 trie-standardmap = { version = "0.16.0" }
 trybuild = { version = "1.0.89" }
diff --git a/bridges/testing/environments/rococo-westend/bridges_rococo_westend.sh b/bridges/testing/environments/rococo-westend/bridges_rococo_westend.sh
index ef4a5597902f..54633449134b 100755
--- a/bridges/testing/environments/rococo-westend/bridges_rococo_westend.sh
+++ b/bridges/testing/environments/rococo-westend/bridges_rococo_westend.sh
@@ -270,7 +270,7 @@ case "$1" in
           "//Alice" \
           1000 \
           "ws://127.0.0.1:9910" \
-          "$(jq --null-input '{ "parents": 2, "interior": { "X1": { "GlobalConsensus": "Westend" } } }')" \
+          "$(jq --null-input '{ "parents": 2, "interior": { "X1": [{ "GlobalConsensus": "Westend" }] } }')" \
           "$GLOBAL_CONSENSUS_WESTEND_SOVEREIGN_ACCOUNT" \
           10000000000 \
           true
@@ -329,7 +329,7 @@ case "$1" in
           "//Alice" \
           1000 \
           "ws://127.0.0.1:9010" \
-          "$(jq --null-input '{ "parents": 2, "interior": { "X1": { "GlobalConsensus": "Rococo" } } }')" \
+          "$(jq --null-input '{ "parents": 2, "interior": { "X1": [{ "GlobalConsensus": "Rococo" }] } }')" \
           "$GLOBAL_CONSENSUS_ROCOCO_SOVEREIGN_ACCOUNT" \
           10000000000 \
           true
diff --git a/bridges/testing/framework/js-helpers/wrapped-assets-balance.js b/bridges/testing/framework/js-helpers/wrapped-assets-balance.js
index 27287118547f..7b343ed97a88 100644
--- a/bridges/testing/framework/js-helpers/wrapped-assets-balance.js
+++ b/bridges/testing/framework/js-helpers/wrapped-assets-balance.js
@@ -8,7 +8,7 @@ async function run(nodeName, networkInfo, args) {
     const bridgedNetworkName = args[2];
     while (true) {
         const foreignAssetAccount = await api.query.foreignAssets.account(
-            { parents: 2, interior: { X1: { GlobalConsensus: bridgedNetworkName } } },
+            { parents: 2, interior: { X1: [{ GlobalConsensus: bridgedNetworkName }] } },
             accountAddress
         );
         if (foreignAssetAccount.isSome) {
diff --git a/cumulus/client/consensus/aura/src/collators/basic.rs b/cumulus/client/consensus/aura/src/collators/basic.rs
index 4efd50a04ec6..0f9583cd0eb0 100644
--- a/cumulus/client/consensus/aura/src/collators/basic.rs
+++ b/cumulus/client/consensus/aura/src/collators/basic.rs
@@ -138,6 +138,7 @@ where
 		};
 
 		let mut last_processed_slot = 0;
+		let mut last_relay_chain_block = Default::default();
 
 		while let Some(request) = collation_requests.next().await {
 			macro_rules! reject_with_error {
@@ -215,11 +216,13 @@ where
 			//
 			// Most parachains currently run with 12 seconds slots and thus, they would try to
 			// produce multiple blocks per slot which very likely would fail on chain. Thus, we have
-			// this "hack" to only produce on block per slot.
+			// this "hack" to only produce one block per slot per relay chain fork.
 			//
 			// With https://github.com/paritytech/polkadot-sdk/issues/3168 this implementation will be
 			// obsolete and also the underlying issue will be fixed.
-			if last_processed_slot >= *claim.slot() {
+			if last_processed_slot >= *claim.slot() &&
+				last_relay_chain_block < *relay_parent_header.number()
+			{
 				continue
 			}
 
@@ -261,6 +264,7 @@ where
 			}
 
 			last_processed_slot = *claim.slot();
+			last_relay_chain_block = *relay_parent_header.number();
 		}
 	}
 }
diff --git a/cumulus/client/pov-recovery/Cargo.toml b/cumulus/client/pov-recovery/Cargo.toml
index a95b24bc2933..3127dd26fcaa 100644
--- a/cumulus/client/pov-recovery/Cargo.toml
+++ b/cumulus/client/pov-recovery/Cargo.toml
@@ -2,7 +2,7 @@
 name = "cumulus-client-pov-recovery"
 version = "0.7.0"
 authors.workspace = true
-description = "Cumulus-specific networking protocol"
+description = "Parachain PoV recovery"
 edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
diff --git a/cumulus/pallets/aura-ext/src/lib.rs b/cumulus/pallets/aura-ext/src/lib.rs
index 4c9e61458a87..dc854eb82018 100644
--- a/cumulus/pallets/aura-ext/src/lib.rs
+++ b/cumulus/pallets/aura-ext/src/lib.rs
@@ -16,7 +16,7 @@
 
 //! Cumulus extension pallet for AuRa
 //!
-//! This pallets extends the Substrate AuRa pallet to make it compatible with parachains. It
+//! This pallet extends the Substrate AuRa pallet to make it compatible with parachains. It
 //! provides the [`Pallet`], the [`Config`] and the [`GenesisConfig`].
 //!
 //! It is also required that the parachain runtime uses the provided [`BlockExecutor`] to properly
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 f3e03aa74300..f85861bdaa54 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml
@@ -3,7 +3,7 @@ name = "bridge-hub-rococo-runtime"
 version = "0.5.0"
 authors.workspace = true
 edition.workspace = true
-description = "Rococo's BridgeHub  parachain runtime"
+description = "Rococo's BridgeHub parachain runtime"
 license = "Apache-2.0"
 
 [lints]
diff --git a/docs/sdk/Cargo.toml b/docs/sdk/Cargo.toml
index 2f85171bb93d..424758c32b34 100644
--- a/docs/sdk/Cargo.toml
+++ b/docs/sdk/Cargo.toml
@@ -22,6 +22,7 @@ frame = { features = [
 	"runtime",
 ], workspace = true, default-features = true }
 pallet-examples = { workspace = true }
+pallet-contracts = { workspace = true }
 pallet-default-config-example = { workspace = true, default-features = true }
 pallet-example-offchain-worker = { workspace = true, default-features = true }
 
diff --git a/docs/sdk/src/guides/your_first_pallet/mod.rs b/docs/sdk/src/guides/your_first_pallet/mod.rs
index 3c74469e1768..006d0be7ded3 100644
--- a/docs/sdk/src/guides/your_first_pallet/mod.rs
+++ b/docs/sdk/src/guides/your_first_pallet/mod.rs
@@ -21,7 +21,7 @@
 //! this guide, namely the crate/package names, based on which template you use.
 //!
 //! > Be aware that you can read the entire source code backing this tutorial by clicking on the
-//! > [`source`](./mod.rs.html) button at the top right of the page.
+//! > `source` button at the top right of the page.
 //!
 //! You should have studied the following modules as a prelude to this guide:
 //!
@@ -45,7 +45,7 @@
 //! Consider the following as a "shell pallet". We continue building the rest of this pallet based
 //! on this template.
 //!
-//! [`pallet::config`] and [`pallet::pallet`](frame_support::pallet) are both mandatory parts of any
+//! [`pallet::config`] and [`pallet::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)]
 //!
@@ -319,13 +319,13 @@
 //! - Learn more about the individual pallet items/macros, such as event and errors and call, in
 //!   [`frame::pallet_macros`].
 //!
-//! [`pallet::storage`]: ../../../frame_support/pallet_macros/attr.config.html
-//! [`pallet::call`]: ../../../frame_support/pallet_macros/attr.call.html
-//! [`pallet::event`]: ../../../frame_support/pallet_macros/attr.event.html
-//! [`pallet::error`]: ../../../frame_support/pallet_macros/attr.error.html
-//! [`pallet::pallet`]: ../../../frame_support/pallet_macros/attr.pallet.html
-//! [`pallet::config`]: ../../../frame_support/pallet_macros/attr.config.html
-//! [`pallet::generate_deposit`]: ../../../frame_support/pallet_macros/attr.generate_deposit.html
+//! [`pallet::storage`]: frame_support::pallet_macros::storage
+//! [`pallet::call`]: frame_support::pallet_macros::call
+//! [`pallet::event`]: frame_support::pallet_macros::event
+//! [`pallet::error`]: frame_support::pallet_macros::error
+//! [`pallet::pallet`]: frame_support::pallet
+//! [`pallet::config`]: frame_support::pallet_macros::config
+//! [`pallet::generate_deposit`]: frame_support::pallet_macros::generate_deposit
 
 #[docify::export]
 #[frame::pallet(dev_mode)]
diff --git a/docs/sdk/src/reference_docs/chain_spec_genesis.rs b/docs/sdk/src/reference_docs/chain_spec_genesis.rs
index 557795cb410c..39e5993d020f 100644
--- a/docs/sdk/src/reference_docs/chain_spec_genesis.rs
+++ b/docs/sdk/src/reference_docs/chain_spec_genesis.rs
@@ -178,7 +178,6 @@
 //! [`pallet::genesis_build`]: frame_support::pallet_macros::genesis_build
 //! [`pallet::genesis_config`]: frame_support::pallet_macros::genesis_config
 //! [`BuildGenesisConfig`]: frame_support::traits::BuildGenesisConfig
-//! [`chain_spec_builder`]: ../../../staging_chain_spec_builder/index.html
 //! [`serde`]: https://serde.rs/field-attrs.html
 //! [`get_storage_for_patch`]: sc_chain_spec::GenesisConfigBuilderRuntimeCaller::get_storage_for_patch
 //! [`GenesisBuilder::get_preset`]: sp_genesis_builder::GenesisBuilder::get_preset
diff --git a/docs/sdk/src/reference_docs/runtime_vs_smart_contract.rs b/docs/sdk/src/reference_docs/runtime_vs_smart_contract.rs
index 4a0ba3ca48f5..c91b66b944c6 100644
--- a/docs/sdk/src/reference_docs/runtime_vs_smart_contract.rs
+++ b/docs/sdk/src/reference_docs/runtime_vs_smart_contract.rs
@@ -20,8 +20,8 @@
 //! #### Smart Contracts in Substrate
 //! Smart Contracts are autonomous, programmable constructs deployed on the blockchain.
 //! In [FRAME](frame), Smart Contracts infrastructure is implemented by the
-//! [`pallet_contracts`](../../../pallet_contracts/index.html) for WASM-based contracts or the
-//! [`pallet_evm`](../../../pallet_evm/index.html) for EVM-compatible contracts. These pallets
+//! [`pallet_contracts`] for WASM-based contracts or the
+//! [`pallet_evm`](https://github.com/polkadot-evm/frontier/tree/master/frame/evm) for EVM-compatible contracts. These pallets
 //! enable Smart Contract developers to build applications and systems on top of a Substrate-based
 //! blockchain.
 //!
@@ -108,7 +108,7 @@
 //! - **Deployment and Iteration**: Smart Contracts, by nature, are designed for more
 //!   straightforward deployment and iteration. Developers can quickly deploy contracts.
 //! - **Contract Code Updates**: Once deployed, although typically immutable, Smart Contracts can be
-//!   upgraded, but lack of migration logic. The [pallet_contracts](../../../pallet_contracts/index.html)
+//!   upgraded, but lack of migration logic. The [`pallet_contracts`]
 //!   allows for contracts to be upgraded by exposing the `set_code` dispatchable. More details on this
 //!   can be found in [Ink! documentation on upgradeable contracts](https://use.ink/basics/upgradeable-contracts).
 //! - **Isolated Impact**: Upgrades or changes to a smart contract generally impact only that
diff --git a/polkadot/README.md b/polkadot/README.md
index 47af79a3aa92..fa14995e9af3 100644
--- a/polkadot/README.md
+++ b/polkadot/README.md
@@ -103,9 +103,8 @@ Connect to the global Polkadot Mainnet network by running:
 ../target/release/polkadot --chain=polkadot
 ```
 
-You can see your node on [telemetry] (set a custom name with `--name "my custom name"`).
-
-[telemetry](https://telemetry.polkadot.io/#list/Polkadot): https://telemetry.polkadot.io/#list/Polkadot
+You can see your node on [Polkadot telemetry](https://telemetry.polkadot.io/#list/0x91b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219da7a70ce90c3)
+(set a custom name with `--name "my custom name"`).
 
 ### Connect to the "Kusama" Canary Network
 
@@ -115,9 +114,8 @@ Connect to the global Kusama canary network by running:
 ../target/release/polkadot --chain=kusama
 ```
 
-You can see your node on [telemetry] (set a custom name with `--name "my custom name"`).
-
-[telemetry](https://telemetry.polkadot.io/#list/Kusama): https://telemetry.polkadot.io/#list/Kusama
+You can see your node on [Kusama telemetry](https://telemetry.polkadot.io/#list/0xb0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe)
+(set a custom name with `--name "my custom name"`).
 
 ### Connect to the Westend Testnet
 
@@ -127,9 +125,8 @@ Connect to the global Westend testnet by running:
 ../target/release/polkadot --chain=westend
 ```
 
-You can see your node on [telemetry] (set a custom name with `--name "my custom name"`).
-
-[telemetry](https://telemetry.polkadot.io/#list/Westend): https://telemetry.polkadot.io/#list/Westend
+You can see your node on [Westend telemetry](https://telemetry.polkadot.io/#list/0xe143f23803ac50e8f6f8e62695d1ce9e4e1d68aa36c1cd2cfd15340213f3423e)
+(set a custom name with `--name "my custom name"`).
 
 ### Obtaining DOTs
 
@@ -147,7 +144,7 @@ Then, grab the Polkadot source code:
 
 ```bash
 git clone https://github.com/paritytech/polkadot-sdk.git
-cd polkadot
+cd polkadot-sdk
 ```
 
 Then build the code. You will need to build in release mode (`--release`) to start a network. Only
@@ -185,7 +182,7 @@ You can run a simple single-node development "network" on your machine by runnin
 cargo run --bin polkadot --release -- --dev
 ```
 
-You can muck around by heading to <https://polkadot.js.org/apps> and choose "Local Node" from the
+You can muck around by heading to <https://polkadot.js.org/apps> and choosing "Local Node" from the
 Settings menu.
 
 ### Local Two-node Testnet
@@ -214,11 +211,11 @@ that we currently maintain.
 
 ### Using Docker
 
-[Using Docker](../docs/contributor/docker.md)
+[Using Docker](https://github.com/paritytech/polkadot-sdk/blob/master/docs/contributor/docker.md)
 
 ### Shell Completion
 
-[Shell Completion](doc/shell-completion.md)
+[Shell Completion](https://github.com/paritytech/polkadot-sdk/blob/master/polkadot/doc/shell-completion.md)
 
 ## Contributing
 
@@ -232,4 +229,4 @@ that we currently maintain.
 
 ## License
 
-Polkadot is [GPL 3.0 licensed](LICENSE).
+Polkadot is [GPL 3.0 licensed](https://github.com/paritytech/polkadot-sdk/blob/master/polkadot/LICENSE).
diff --git a/polkadot/node/core/dispute-coordinator/src/initialized.rs b/polkadot/node/core/dispute-coordinator/src/initialized.rs
index 5f86da87f21c..5096fe5e6891 100644
--- a/polkadot/node/core/dispute-coordinator/src/initialized.rs
+++ b/polkadot/node/core/dispute-coordinator/src/initialized.rs
@@ -1351,6 +1351,12 @@ impl Initialized {
 				}
 			}
 			for validator_index in new_state.votes().invalid.keys() {
+				gum::debug!(
+					target: LOG_TARGET,
+					?candidate_hash,
+					?validator_index,
+					"Disabled offchain for voting invalid against a valid candidate",
+				);
 				self.offchain_disabled_validators
 					.insert_against_valid(session, *validator_index);
 			}
@@ -1375,6 +1381,13 @@ impl Initialized {
 			}
 			for (validator_index, (kind, _sig)) in new_state.votes().valid.raw() {
 				let is_backer = kind.is_backing();
+				gum::debug!(
+					target: LOG_TARGET,
+					?candidate_hash,
+					?validator_index,
+					?is_backer,
+					"Disabled offchain for voting valid for an invalid candidate",
+				);
 				self.offchain_disabled_validators.insert_for_invalid(
 					session,
 					*validator_index,
diff --git a/polkadot/node/core/dispute-coordinator/src/lib.rs b/polkadot/node/core/dispute-coordinator/src/lib.rs
index daa384b36ffb..34d9ddf3a97c 100644
--- a/polkadot/node/core/dispute-coordinator/src/lib.rs
+++ b/polkadot/node/core/dispute-coordinator/src/lib.rs
@@ -478,6 +478,18 @@ pub fn is_potential_spam(
 	let all_invalid_votes_disabled = vote_state.invalid_votes_all_disabled(is_disabled);
 	let ignore_disabled = !is_confirmed && all_invalid_votes_disabled;
 
+	gum::trace!(
+		target: LOG_TARGET,
+		?candidate_hash,
+		?is_disputed,
+		?is_included,
+		?is_backed,
+		?is_confirmed,
+		?all_invalid_votes_disabled,
+		?ignore_disabled,
+		"Checking for potential spam"
+	);
+
 	(is_disputed && !is_included && !is_backed && !is_confirmed) || ignore_disabled
 }
 
diff --git a/polkadot/node/network/approval-distribution/src/lib.rs b/polkadot/node/network/approval-distribution/src/lib.rs
index 3462aaef1f69..134586253ce1 100644
--- a/polkadot/node/network/approval-distribution/src/lib.rs
+++ b/polkadot/node/network/approval-distribution/src/lib.rs
@@ -2508,7 +2508,9 @@ impl ApprovalDistribution {
 					};
 
 
-					self.handle_from_orchestra(message, &mut approval_voting_sender, &mut network_sender, state, rng).await;
+					if self.handle_from_orchestra(message, &mut approval_voting_sender, &mut network_sender, state, rng).await {
+						return;
+					}
 
 				},
 			}
@@ -2516,6 +2518,8 @@ impl ApprovalDistribution {
 	}
 
 	/// Handles a from orchestra message received by approval distribution subystem.
+	///
+	/// Returns `true` if the subsystem should be stopped.
 	pub async fn handle_from_orchestra<
 		N: overseer::SubsystemSender<NetworkBridgeTxMessage>,
 		A: overseer::SubsystemSender<ApprovalVotingMessage>,
@@ -2526,7 +2530,7 @@ impl ApprovalDistribution {
 		network_sender: &mut N,
 		state: &mut State,
 		rng: &mut (impl CryptoRng + Rng),
-	) {
+	) -> bool {
 		match message {
 			FromOrchestra::Communication { msg } =>
 				Self::handle_incoming(
@@ -2555,8 +2559,9 @@ impl ApprovalDistribution {
 				gum::trace!(target: LOG_TARGET, number = %number, "finalized signal");
 				state.handle_block_finalized(network_sender, &self.metrics, number).await;
 			},
-			FromOrchestra::Signal(OverseerSignal::Conclude) => return,
+			FromOrchestra::Signal(OverseerSignal::Conclude) => return true,
 		}
+		false
 	}
 
 	async fn handle_incoming<
diff --git a/polkadot/node/network/approval-distribution/src/tests.rs b/polkadot/node/network/approval-distribution/src/tests.rs
index 3ea722c51a92..1ca571721ea9 100644
--- a/polkadot/node/network/approval-distribution/src/tests.rs
+++ b/polkadot/node/network/approval-distribution/src/tests.rs
@@ -59,9 +59,13 @@ fn test_harness<T: Future<Output = VirtualOverseer>>(
 	let subsystem = ApprovalDistribution::new(Default::default());
 	{
 		let mut rng = rand_chacha::ChaCha12Rng::seed_from_u64(12345);
-
-		let subsystem =
-			subsystem.run_inner(context, &mut state, REPUTATION_CHANGE_TEST_INTERVAL, &mut rng);
+		let (tx, rx) = oneshot::channel();
+		let subsystem = async {
+			subsystem
+				.run_inner(context, &mut state, REPUTATION_CHANGE_TEST_INTERVAL, &mut rng)
+				.await;
+			tx.send(()).expect("Fail to notify subystem is done");
+		};
 
 		let test_fut = test_fn(virtual_overseer);
 
@@ -76,6 +80,8 @@ fn test_harness<T: Future<Output = VirtualOverseer>>(
 					.timeout(TIMEOUT)
 					.await
 					.expect("Conclude send timeout");
+				let _ =
+					rx.timeout(Duration::from_secs(2)).await.expect("Subsystem did not conclude");
 			},
 			subsystem,
 		));
diff --git a/polkadot/runtime/parachains/src/coretime/mod.rs b/polkadot/runtime/parachains/src/coretime/mod.rs
index fbd8935f1990..9b9bdb86878f 100644
--- a/polkadot/runtime/parachains/src/coretime/mod.rs
+++ b/polkadot/runtime/parachains/src/coretime/mod.rs
@@ -358,7 +358,10 @@ fn mk_coretime_call<T: Config>(call: crate::coretime::CoretimeCalls) -> Instruct
 
 fn do_notify_revenue<T: Config>(when: BlockNumber, raw_revenue: Balance) -> Result<(), XcmError> {
 	let dest = Junction::Parachain(T::BrokerId::get()).into_location();
-	let mut message = Vec::new();
+	let mut message = vec![Instruction::UnpaidExecution {
+		weight_limit: WeightLimit::Unlimited,
+		check_origin: None,
+	}];
 	let asset = Asset { id: AssetId(Location::here()), fun: Fungible(raw_revenue) };
 	let dummy_xcm_context = XcmContext { origin: None, message_id: [0; 32], topic: None };
 
@@ -384,10 +387,6 @@ fn do_notify_revenue<T: Config>(when: BlockNumber, raw_revenue: Balance) -> Resu
 
 		message.extend(
 			[
-				Instruction::UnpaidExecution {
-					weight_limit: WeightLimit::Unlimited,
-					check_origin: None,
-				},
 				ReceiveTeleportedAsset(assets_reanchored),
 				DepositAsset {
 					assets: Wild(AllCounted(1)),
diff --git a/polkadot/runtime/rococo/src/lib.rs b/polkadot/runtime/rococo/src/lib.rs
index 97fa2841936e..068fe2dfeb6f 100644
--- a/polkadot/runtime/rococo/src/lib.rs
+++ b/polkadot/runtime/rococo/src/lib.rs
@@ -1335,6 +1335,7 @@ impl pallet_beefy_mmr::Config for Runtime {
 	type BeefyAuthorityToMerkleLeaf = pallet_beefy_mmr::BeefyEcdsaToEthereum;
 	type LeafExtra = H256;
 	type BeefyDataProvider = ParaHeadsRootProvider;
+	type WeightInfo = weights::pallet_beefy_mmr::WeightInfo<Runtime>;
 }
 
 impl paras_sudo_wrapper::Config for Runtime {}
@@ -1629,47 +1630,45 @@ pub mod migrations {
 
 	/// Unreleased migrations. Add new ones here:
 	pub type Unreleased = (
-		pallet_society::migrations::MigrateToV2<Runtime, (), ()>,
-		parachains_configuration::migration::v7::MigrateToV7<Runtime>,
-		assigned_slots::migration::v1::MigrateToV1<Runtime>,
-		parachains_scheduler::migration::MigrateV1ToV2<Runtime>,
-		parachains_configuration::migration::v8::MigrateToV8<Runtime>,
-		parachains_configuration::migration::v9::MigrateToV9<Runtime>,
-		paras_registrar::migration::MigrateToV1<Runtime, ()>,
-		pallet_referenda::migration::v1::MigrateV0ToV1<Runtime, ()>,
-		pallet_referenda::migration::v1::MigrateV0ToV1<Runtime, pallet_referenda::Instance2>,
-
-		// Unlock & unreserve Gov1 funds
-
-		pallet_elections_phragmen::migrations::unlock_and_unreserve_all_funds::UnlockAndUnreserveAllFunds<UnlockConfig>,
-		pallet_democracy::migrations::unlock_and_unreserve_all_funds::UnlockAndUnreserveAllFunds<UnlockConfig>,
-		pallet_tips::migrations::unreserve_deposits::UnreserveDeposits<UnlockConfig, ()>,
-
-		// Delete all Gov v1 pallet storage key/values.
-
-		frame_support::migrations::RemovePallet<DemocracyPalletName, <Runtime as frame_system::Config>::DbWeight>,
-		frame_support::migrations::RemovePallet<CouncilPalletName, <Runtime as frame_system::Config>::DbWeight>,
-		frame_support::migrations::RemovePallet<TechnicalCommitteePalletName, <Runtime as frame_system::Config>::DbWeight>,
-		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>,
-
-		// Migrate Identity pallet for Usernames
-		pallet_identity::migration::versioned::V0ToV1<Runtime, IDENTITY_MIGRATION_KEY_LIMIT>,
-		parachains_configuration::migration::v11::MigrateToV11<Runtime>,
-		// This needs to come after the `parachains_configuration` above as we are reading the configuration.
-		coretime::migration::MigrateToCoretime<Runtime, crate::xcm_config::XcmRouter, GetLegacyLeaseImpl>,
-		parachains_configuration::migration::v12::MigrateToV12<Runtime>,
-		parachains_on_demand::migration::MigrateV0ToV1<Runtime>,
-
-		// permanent
-		pallet_xcm::migration::MigrateToLatestXcmVersion<Runtime>,
-
-		parachains_inclusion::migration::MigrateToV1<Runtime>,
-	);
+        pallet_society::migrations::MigrateToV2<Runtime, (), ()>,
+        parachains_configuration::migration::v7::MigrateToV7<Runtime>,
+        assigned_slots::migration::v1::MigrateToV1<Runtime>,
+        parachains_scheduler::migration::MigrateV1ToV2<Runtime>,
+        parachains_configuration::migration::v8::MigrateToV8<Runtime>,
+        parachains_configuration::migration::v9::MigrateToV9<Runtime>,
+        paras_registrar::migration::MigrateToV1<Runtime, ()>,
+        pallet_referenda::migration::v1::MigrateV0ToV1<Runtime, ()>,
+        pallet_referenda::migration::v1::MigrateV0ToV1<Runtime, pallet_referenda::Instance2>,
+
+        // Unlock & unreserve Gov1 funds
+
+        pallet_elections_phragmen::migrations::unlock_and_unreserve_all_funds::UnlockAndUnreserveAllFunds<UnlockConfig>,
+        pallet_democracy::migrations::unlock_and_unreserve_all_funds::UnlockAndUnreserveAllFunds<UnlockConfig>,
+        pallet_tips::migrations::unreserve_deposits::UnreserveDeposits<UnlockConfig, ()>,
+
+        // Delete all Gov v1 pallet storage key/values.
+
+        frame_support::migrations::RemovePallet<DemocracyPalletName, <Runtime as frame_system::Config>::DbWeight>,
+        frame_support::migrations::RemovePallet<CouncilPalletName, <Runtime as frame_system::Config>::DbWeight>,
+        frame_support::migrations::RemovePallet<TechnicalCommitteePalletName, <Runtime as frame_system::Config>::DbWeight>,
+        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>,
+
+        // Migrate Identity pallet for Usernames
+        pallet_identity::migration::versioned::V0ToV1<Runtime, IDENTITY_MIGRATION_KEY_LIMIT>,
+        parachains_configuration::migration::v11::MigrateToV11<Runtime>,
+        // This needs to come after the `parachains_configuration` above as we are reading the configuration.
+        coretime::migration::MigrateToCoretime<Runtime, crate::xcm_config::XcmRouter, GetLegacyLeaseImpl>,
+        parachains_configuration::migration::v12::MigrateToV12<Runtime>,
+        parachains_on_demand::migration::MigrateV0ToV1<Runtime>,
+
+        // permanent
+        pallet_xcm::migration::MigrateToLatestXcmVersion<Runtime>,
+        parachains_inclusion::migration::MigrateToV1<Runtime>,
+    );
 }
 
 /// Executive: handles dispatch to the various modules.
@@ -1735,6 +1734,7 @@ mod benches {
 		// Substrate
 		[pallet_balances, Balances]
 		[pallet_balances, NisCounterpartBalances]
+		[pallet_beefy_mmr, MmrLeaf]
 		[frame_benchmarking::baseline, Baseline::<Runtime>]
 		[pallet_bounties, Bounties]
 		[pallet_child_bounties, ChildBounties]
diff --git a/polkadot/runtime/rococo/src/weights/mod.rs b/polkadot/runtime/rococo/src/weights/mod.rs
index 6d314772ae07..020f8e22594a 100644
--- a/polkadot/runtime/rococo/src/weights/mod.rs
+++ b/polkadot/runtime/rococo/src/weights/mod.rs
@@ -19,6 +19,7 @@ pub mod frame_system;
 pub mod pallet_asset_rate;
 pub mod pallet_balances_balances;
 pub mod pallet_balances_nis_counterpart_balances;
+pub mod pallet_beefy_mmr;
 pub mod pallet_bounties;
 pub mod pallet_child_bounties;
 pub mod pallet_conviction_voting;
diff --git a/polkadot/runtime/rococo/src/weights/pallet_beefy_mmr.rs b/polkadot/runtime/rococo/src/weights/pallet_beefy_mmr.rs
new file mode 100644
index 000000000000..317c9149ec6c
--- /dev/null
+++ b/polkadot/runtime/rococo/src/weights/pallet_beefy_mmr.rs
@@ -0,0 +1,89 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Autogenerated weights for `pallet_beefy_mmr`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-08-13, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `runner-696hpswk-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
+// 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_beefy_mmr
+// --chain=rococo-dev
+// --header=./polkadot/file_header.txt
+// --output=./polkadot/runtime/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_beefy_mmr`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_beefy_mmr::WeightInfo for WeightInfo<T> {
+	/// Storage: `System::BlockHash` (r:1 w:0)
+	/// Proof: `System::BlockHash` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
+	fn extract_validation_context() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `92`
+		//  Estimated: `3509`
+		// Minimum execution time: 7_116_000 picoseconds.
+		Weight::from_parts(7_343_000, 0)
+			.saturating_add(Weight::from_parts(0, 3509))
+			.saturating_add(T::DbWeight::get().reads(1))
+	}
+	/// Storage: `Mmr::Nodes` (r:1 w:0)
+	/// Proof: `Mmr::Nodes` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`)
+	fn read_peak() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `234`
+		//  Estimated: `3505`
+		// Minimum execution time: 5_652_000 picoseconds.
+		Weight::from_parts(5_963_000, 0)
+			.saturating_add(Weight::from_parts(0, 3505))
+			.saturating_add(T::DbWeight::get().reads(1))
+	}
+	/// Storage: `Mmr::RootHash` (r:1 w:0)
+	/// Proof: `Mmr::RootHash` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	/// Storage: `Mmr::NumberOfLeaves` (r:1 w:0)
+	/// Proof: `Mmr::NumberOfLeaves` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// The range of component `n` is `[2, 512]`.
+	fn n_items_proof_is_non_canonical(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `226`
+		//  Estimated: `1517`
+		// Minimum execution time: 11_953_000 picoseconds.
+		Weight::from_parts(15_978_891, 0)
+			.saturating_add(Weight::from_parts(0, 1517))
+			// Standard Error: 1_780
+			.saturating_add(Weight::from_parts(1_480_582, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
+	}
+}
diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs
index 5193ee5a4695..fa55731a5039 100644
--- a/polkadot/runtime/westend/src/lib.rs
+++ b/polkadot/runtime/westend/src/lib.rs
@@ -99,7 +99,7 @@ use sp_runtime::{
 		IdentityLookup, Keccak256, OpaqueKeys, SaturatedConversion, Verify,
 	},
 	transaction_validity::{TransactionPriority, TransactionSource, TransactionValidity},
-	ApplyExtrinsicResult, FixedU128, KeyTypeId, Perbill, Percent, Permill,
+	ApplyExtrinsicResult, FixedU128, KeyTypeId, Percent, Permill,
 };
 use sp_staking::SessionIndex;
 #[cfg(any(feature = "std", test))]
@@ -461,6 +461,7 @@ impl pallet_beefy_mmr::Config for Runtime {
 	type BeefyAuthorityToMerkleLeaf = pallet_beefy_mmr::BeefyEcdsaToEthereum;
 	type LeafExtra = H256;
 	type BeefyDataProvider = ParaHeadsRootProvider;
+	type WeightInfo = weights::pallet_beefy_mmr::WeightInfo<Runtime>;
 }
 
 parameter_types! {
@@ -601,20 +602,20 @@ impl pallet_election_provider_multi_phase::MinerConfig for Runtime {
 	type MaxWeight = OffchainSolutionWeightLimit;
 	type Solution = NposCompactSolution16;
 	type MaxVotesPerVoter = <
-		<Self as pallet_election_provider_multi_phase::Config>::DataProvider
-		as
-		frame_election_provider_support::ElectionDataProvider
-	>::MaxVotesPerVoter;
+    <Self as pallet_election_provider_multi_phase::Config>::DataProvider
+    as
+    frame_election_provider_support::ElectionDataProvider
+    >::MaxVotesPerVoter;
 	type MaxWinners = MaxActiveValidators;
 
 	// The unsigned submissions have to respect the weight of the submit_unsigned call, thus their
 	// weight estimate function is wired to this call's weight.
 	fn solution_weight(v: u32, t: u32, a: u32, d: u32) -> Weight {
 		<
-			<Self as pallet_election_provider_multi_phase::Config>::WeightInfo
-			as
-			pallet_election_provider_multi_phase::WeightInfo
-		>::submit_unsigned(v, t, a, d)
+        <Self as pallet_election_provider_multi_phase::Config>::WeightInfo
+        as
+        pallet_election_provider_multi_phase::WeightInfo
+        >::submit_unsigned(v, t, a, d)
 	}
 }
 
@@ -1759,11 +1760,8 @@ pub type SignedExtra = (
 );
 
 parameter_types! {
-	// This is the max pools that will be migrated in the runtime upgrade. Westend has more pools
-	// than this, but we want to emulate some non migrated pools. In prod runtimes, if weight is not
-	// a concern, it is recommended to set to (existing pools + 10) to also account for any new
-	// pools getting created before the migration is actually executed.
-	pub const MaxPoolsToMigrate: u32 = 250;
+	/// Bounding number of agent pot accounts to be migrated in a single block.
+	pub const MaxAgentsToMigrate: u32 = 300;
 }
 
 /// All migrations that will run on the next runtime upgrade.
@@ -1797,13 +1795,11 @@ pub mod migrations {
 
 	/// Unreleased migrations. Add new ones here:
 	pub type Unreleased = (
-		// Migrate NominationPools to `DelegateStake` adapter. This is unversioned upgrade and
-		// should not be applied yet in Kusama/Polkadot.
-		pallet_nomination_pools::migration::unversioned::DelegationStakeMigration<
+		// This is only needed for Westend.
+		pallet_delegated_staking::migration::unversioned::ProxyDelegatorMigration<
 			Runtime,
-			MaxPoolsToMigrate,
+			MaxAgentsToMigrate,
 		>,
-		pallet_staking::migrations::v15::MigrateV14ToV15<Runtime>,
 	);
 }
 
@@ -1847,6 +1843,7 @@ mod benches {
 		// Substrate
 		[pallet_bags_list, VoterList]
 		[pallet_balances, Balances]
+		[pallet_beefy_mmr, BeefyMmrLeaf]
 		[pallet_conviction_voting, ConvictionVoting]
 		[pallet_election_provider_multi_phase, ElectionProviderMultiPhase]
 		[frame_election_provider_support, ElectionProviderBench::<Runtime>]
@@ -2474,6 +2471,14 @@ sp_api::impl_runtime_apis! {
 		fn member_needs_delegate_migration(member: AccountId) -> bool {
 			NominationPools::api_member_needs_delegate_migration(member)
 		}
+
+		fn member_total_balance(member: AccountId) -> Balance {
+			NominationPools::api_member_total_balance(member)
+		}
+
+		fn pool_balance(pool_id: pallet_nomination_pools::PoolId) -> Balance {
+			NominationPools::api_pool_balance(pool_id)
+		}
 	}
 
 	impl pallet_staking_runtime_api::StakingApi<Block, Balance, AccountId> for Runtime {
@@ -2774,45 +2779,6 @@ sp_api::impl_runtime_apis! {
 	}
 }
 
-#[cfg(all(test, feature = "try-runtime"))]
-mod remote_tests {
-	use super::*;
-	use frame_try_runtime::{runtime_decl_for_try_runtime::TryRuntime, UpgradeCheckSelect};
-	use remote_externalities::{
-		Builder, Mode, OfflineConfig, OnlineConfig, SnapshotConfig, Transport,
-	};
-	use std::env::var;
-
-	#[tokio::test]
-	async fn run_migrations() {
-		if var("RUN_MIGRATION_TESTS").is_err() {
-			return;
-		}
-
-		sp_tracing::try_init_simple();
-		let transport: Transport =
-			var("WS").unwrap_or("wss://westend-rpc.polkadot.io:443".to_string()).into();
-		let maybe_state_snapshot: Option<SnapshotConfig> = var("SNAP").map(|s| s.into()).ok();
-		let mut ext = Builder::<Block>::default()
-			.mode(if let Some(state_snapshot) = maybe_state_snapshot {
-				Mode::OfflineOrElseOnline(
-					OfflineConfig { state_snapshot: state_snapshot.clone() },
-					OnlineConfig {
-						transport,
-						state_snapshot: Some(state_snapshot),
-						..Default::default()
-					},
-				)
-			} else {
-				Mode::Online(OnlineConfig { transport, ..Default::default() })
-			})
-			.build()
-			.await
-			.unwrap();
-		ext.execute_with(|| Runtime::on_runtime_upgrade(UpgradeCheckSelect::PreAndPost));
-	}
-}
-
 mod clean_state_migration {
 	use super::Runtime;
 	#[cfg(feature = "try-runtime")]
diff --git a/polkadot/runtime/westend/src/tests.rs b/polkadot/runtime/westend/src/tests.rs
index 4d5e2e946bce..dc8103ab52c4 100644
--- a/polkadot/runtime/westend/src/tests.rs
+++ b/polkadot/runtime/westend/src/tests.rs
@@ -99,3 +99,140 @@ fn check_treasury_pallet_id() {
 		westend_runtime_constants::TREASURY_PALLET_ID
 	);
 }
+
+#[cfg(all(test, feature = "try-runtime"))]
+mod remote_tests {
+	use super::*;
+	use frame_try_runtime::{runtime_decl_for_try_runtime::TryRuntime, UpgradeCheckSelect};
+	use remote_externalities::{
+		Builder, Mode, OfflineConfig, OnlineConfig, SnapshotConfig, Transport,
+	};
+	use std::env::var;
+
+	#[tokio::test]
+	async fn run_migrations() {
+		if var("RUN_MIGRATION_TESTS").is_err() {
+			return;
+		}
+
+		sp_tracing::try_init_simple();
+		let transport: Transport =
+			var("WS").unwrap_or("wss://westend-rpc.polkadot.io:443".to_string()).into();
+		let maybe_state_snapshot: Option<SnapshotConfig> = var("SNAP").map(|s| s.into()).ok();
+		let mut ext = Builder::<Block>::default()
+			.mode(if let Some(state_snapshot) = maybe_state_snapshot {
+				Mode::OfflineOrElseOnline(
+					OfflineConfig { state_snapshot: state_snapshot.clone() },
+					OnlineConfig {
+						transport,
+						state_snapshot: Some(state_snapshot),
+						..Default::default()
+					},
+				)
+			} else {
+				Mode::Online(OnlineConfig { transport, ..Default::default() })
+			})
+			.build()
+			.await
+			.unwrap();
+		ext.execute_with(|| Runtime::on_runtime_upgrade(UpgradeCheckSelect::PreAndPost));
+	}
+
+	#[tokio::test]
+	async fn delegate_stake_migration() {
+		// Intended to be run only manually.
+		if var("RUN_MIGRATION_TESTS").is_err() {
+			return;
+		}
+		use frame_support::assert_ok;
+		sp_tracing::try_init_simple();
+
+		let transport: Transport = var("WS").unwrap_or("ws://127.0.0.1:9900".to_string()).into();
+		let maybe_state_snapshot: Option<SnapshotConfig> = var("SNAP").map(|s| s.into()).ok();
+		let mut ext = Builder::<Block>::default()
+			.mode(if let Some(state_snapshot) = maybe_state_snapshot {
+				Mode::OfflineOrElseOnline(
+					OfflineConfig { state_snapshot: state_snapshot.clone() },
+					OnlineConfig {
+						transport,
+						state_snapshot: Some(state_snapshot),
+						pallets: vec![
+							"staking".into(),
+							"system".into(),
+							"balances".into(),
+							"nomination-pools".into(),
+							"delegated-staking".into(),
+						],
+						..Default::default()
+					},
+				)
+			} else {
+				Mode::Online(OnlineConfig { transport, ..Default::default() })
+			})
+			.build()
+			.await
+			.unwrap();
+		ext.execute_with(|| {
+			// create an account with some balance
+			let alice = AccountId::from([1u8; 32]);
+			use frame_support::traits::Currency;
+			let _ = Balances::deposit_creating(&alice, 100_000 * UNITS);
+
+			// iterate over all pools
+			pallet_nomination_pools::BondedPools::<Runtime>::iter_keys().for_each(|k| {
+				if pallet_nomination_pools::Pallet::<Runtime>::api_pool_needs_delegate_migration(k)
+				{
+					assert_ok!(
+						pallet_nomination_pools::Pallet::<Runtime>::migrate_pool_to_delegate_stake(
+							RuntimeOrigin::signed(alice.clone()).into(),
+							k,
+						)
+					);
+				}
+			});
+
+			// member migration stats
+			let mut success = 0;
+			let mut direct_stakers = 0;
+			let mut unexpected_errors = 0;
+
+			// iterate over all pool members
+			pallet_nomination_pools::PoolMembers::<Runtime>::iter_keys().for_each(|k| {
+				if pallet_nomination_pools::Pallet::<Runtime>::api_member_needs_delegate_migration(
+					k.clone(),
+				) {
+					// reasons migrations can fail:
+					let is_direct_staker = pallet_staking::Bonded::<Runtime>::contains_key(&k);
+
+					let migration = pallet_nomination_pools::Pallet::<Runtime>::migrate_delegation(
+						RuntimeOrigin::signed(alice.clone()).into(),
+						sp_runtime::MultiAddress::Id(k.clone()),
+					);
+
+					if is_direct_staker {
+						// if the member is a direct staker, the migration should fail until pool
+						// member unstakes all funds from pallet-staking.
+						direct_stakers += 1;
+						assert_eq!(
+							migration.unwrap_err(),
+							pallet_delegated_staking::Error::<Runtime>::AlreadyStaking.into()
+						);
+					} else if migration.is_err() {
+						unexpected_errors += 1;
+						log::error!(target: "remote_test", "Unexpected error {:?} while migrating {:?}", migration.unwrap_err(), k);
+					} else {
+						success += 1;
+					}
+				}
+			});
+
+			log::info!(
+				target: "remote_test",
+				"Migration stats: success: {}, direct_stakers: {}, unexpected_errors: {}",
+				success,
+				direct_stakers,
+				unexpected_errors
+			);
+		});
+	}
+}
diff --git a/polkadot/runtime/westend/src/weights/mod.rs b/polkadot/runtime/westend/src/weights/mod.rs
index 526a150a3c00..1e7b01bc472b 100644
--- a/polkadot/runtime/westend/src/weights/mod.rs
+++ b/polkadot/runtime/westend/src/weights/mod.rs
@@ -20,6 +20,7 @@ pub mod frame_system;
 pub mod pallet_asset_rate;
 pub mod pallet_bags_list;
 pub mod pallet_balances;
+pub mod pallet_beefy_mmr;
 pub mod pallet_conviction_voting;
 pub mod pallet_election_provider_multi_phase;
 pub mod pallet_fast_unstake;
diff --git a/polkadot/runtime/westend/src/weights/pallet_beefy_mmr.rs b/polkadot/runtime/westend/src/weights/pallet_beefy_mmr.rs
new file mode 100644
index 000000000000..5be207e3fcff
--- /dev/null
+++ b/polkadot/runtime/westend/src/weights/pallet_beefy_mmr.rs
@@ -0,0 +1,89 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Autogenerated weights for `pallet_beefy_mmr`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-08-13, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `runner-696hpswk-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
+// 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_beefy_mmr
+// --chain=westend-dev
+// --header=./polkadot/file_header.txt
+// --output=./polkadot/runtime/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_beefy_mmr`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_beefy_mmr::WeightInfo for WeightInfo<T> {
+	/// Storage: `System::BlockHash` (r:1 w:0)
+	/// Proof: `System::BlockHash` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
+	fn extract_validation_context() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `92`
+		//  Estimated: `3509`
+		// Minimum execution time: 7_850_000 picoseconds.
+		Weight::from_parts(8_169_000, 0)
+			.saturating_add(Weight::from_parts(0, 3509))
+			.saturating_add(T::DbWeight::get().reads(1))
+	}
+	/// Storage: `Mmr::Nodes` (r:1 w:0)
+	/// Proof: `Mmr::Nodes` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`)
+	fn read_peak() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `201`
+		//  Estimated: `3505`
+		// Minimum execution time: 6_852_000 picoseconds.
+		Weight::from_parts(7_448_000, 0)
+			.saturating_add(Weight::from_parts(0, 3505))
+			.saturating_add(T::DbWeight::get().reads(1))
+	}
+	/// Storage: `Mmr::RootHash` (r:1 w:0)
+	/// Proof: `Mmr::RootHash` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	/// Storage: `Mmr::NumberOfLeaves` (r:1 w:0)
+	/// Proof: `Mmr::NumberOfLeaves` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// The range of component `n` is `[2, 512]`.
+	fn n_items_proof_is_non_canonical(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `193`
+		//  Estimated: `1517`
+		// Minimum execution time: 12_860_000 picoseconds.
+		Weight::from_parts(17_158_162, 0)
+			.saturating_add(Weight::from_parts(0, 1517))
+			// Standard Error: 1_732
+			.saturating_add(Weight::from_parts(1_489_410, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
+	}
+}
diff --git a/prdoc/pr_4822.prdoc b/prdoc/pr_4822.prdoc
new file mode 100644
index 000000000000..44f3e41d8d5a
--- /dev/null
+++ b/prdoc/pr_4822.prdoc
@@ -0,0 +1,25 @@
+# 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: Ensure as many as possible pool members can migrate to `DelegateStake`
+
+doc:
+  - audience: Runtime Dev
+    description: |
+      1. Allows pool members to use their total balance while joining pool with `DelegateStake`.
+      2. Gates call mutating pool or member in unmigrated state.
+      3. Runtime apis for reading pool and member balance.
+
+crates:
+  - name: westend-runtime
+    bump: minor
+  - name: kitchensink-runtime
+    bump: patch
+  - name: pallet-delegated-staking
+    bump: patch
+  - name: pallet-nomination-pools
+    bump: minor
+  - name: sp-staking
+    bump: patch
+  - name: pallet-nomination-pools-runtime-api
+    bump: minor
diff --git a/prdoc/pr_4999.prdoc b/prdoc/pr_4999.prdoc
new file mode 100644
index 000000000000..d396fcdbe8b3
--- /dev/null
+++ b/prdoc/pr_4999.prdoc
@@ -0,0 +1,18 @@
+# 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: Fixes entropy for derivation of proxy delegator account.
+
+doc:
+  - audience: Runtime Dev
+    description: |
+      This fixes how ProxyDelegator accounts are derived but may cause issues in Westend since it would use the old
+      derivative accounts. Does not affect Polkadot/Kusama as this pallet is not deployed to them yet.
+
+crates:
+  - name: westend-runtime
+    bump: patch
+  - name: pallet-delegated-staking
+    bump: patch
+  - name: pallet-nomination-pools
+    bump: patch
\ No newline at end of file
diff --git a/prdoc/pr_5188.prdoc b/prdoc/pr_5188.prdoc
new file mode 100644
index 000000000000..b2ab9ff6653b
--- /dev/null
+++ b/prdoc/pr_5188.prdoc
@@ -0,0 +1,32 @@
+# 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: Added benchmarks for BEEFY fork voting
+
+doc:
+  - audience:
+    - Runtime Dev
+    - Runtime User
+    description: |
+      This PR adds benchmarks for `report_fork_voting` and `report_future_voting` extrinsics to `pallet-beefy`.
+      `report_future_voting` can be called now. `report_fork_voting` can't be called yet. Even though we have added
+       the formula for computing its weight, we still use `Weight::MAX`. We will set the proper weight in a future PR.
+       In order to do this we need to also check that the ancestry proof is optimal.
+       The PR adds a `WeightInfo` associated trait to the `pallet_beefy_mmr::Config` and defines benchmarks for
+       `pallet_beefy_mmr`.
+
+crates:
+  - name: pallet-mmr
+    bump: minor
+  - name: sp-mmr-primitives
+    bump: minor
+  - name: sp-consensus-beefy
+    bump: minor
+  - name: rococo-runtime
+    bump: minor
+  - name: pallet-beefy
+    bump: major
+  - name: pallet-beefy-mmr
+    bump: major
+  - name: westend-runtime
+    bump: minor
diff --git a/prdoc/pr_5252.prdoc b/prdoc/pr_5252.prdoc
new file mode 100644
index 000000000000..fd4454ac3b9d
--- /dev/null
+++ b/prdoc/pr_5252.prdoc
@@ -0,0 +1,11 @@
+title: Additional logging in `dispute-coordinator` subsystem
+
+doc:
+  - audience: Node Dev
+    description: |
+      Additional logging in `dispute-coordinator` subsystem tracing the list of offchain disabled
+      validators and the reason why an import statement is considered spam.
+
+crates:
+  - name: polkadot-node-core-dispute-coordinator
+    bump: patch
\ No newline at end of file
diff --git a/prdoc/pr_5262.prdoc b/prdoc/pr_5262.prdoc
new file mode 100644
index 000000000000..828f0ffeb1bc
--- /dev/null
+++ b/prdoc/pr_5262.prdoc
@@ -0,0 +1,25 @@
+# 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: Correct some typos in crates' descriptions
+
+doc:
+  - audience: Runtime Dev
+    description: |
+      Corrected typos and copy-paste errors in crates' descriptions.
+
+crates:
+  - name: cumulus-client-pov-recovery
+    bump: patch
+  - name: cumulus-pallet-aura-ext
+    bump: patch
+  - name: bridge-hub-rococo-runtime
+    bump: patch
+  - name: frame-try-runtime
+    bump: patch
+  - name: pallet-whitelist
+    bump: patch
+  - name: polkadot-sdk
+    bump: patch
+  - name: polkadot-runtime-parachains
+    bump: none
diff --git a/prdoc/pr_5326.prdoc b/prdoc/pr_5326.prdoc
new file mode 100644
index 000000000000..0301b8c17a30
--- /dev/null
+++ b/prdoc/pr_5326.prdoc
@@ -0,0 +1,13 @@
+# 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: Update Readme of the `polkadot` crate
+
+doc:
+  - audience: Node Operator
+    description: |
+      Updated Readme of the `polkadot` crate.
+
+crates:
+  - name: polkadot
+    bump: patch
diff --git a/prdoc/pr_5348.prdoc b/prdoc/pr_5348.prdoc
new file mode 100644
index 000000000000..c2282c4c74c4
--- /dev/null
+++ b/prdoc/pr_5348.prdoc
@@ -0,0 +1,13 @@
+# 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: allow for u8 to be used as hold/freeze reason
+
+doc:
+  - audience: Runtime Dev
+    description: |
+      Allows for `u8` type to be configured as `HoldReason` and `FreezeReason`
+
+crates:
+  - name: frame-support
+    bump: patch
diff --git a/prdoc/pr_5352.prdoc b/prdoc/pr_5352.prdoc
new file mode 100644
index 000000000000..4b055d81cb51
--- /dev/null
+++ b/prdoc/pr_5352.prdoc
@@ -0,0 +1,10 @@
+title: "Aura: Ensure parachains are building on all relay chain forks"
+
+doc:
+  - audience: Node Dev
+    description: |
+      Ensure that parachains using the `basic` collator are building on all relay chain forks.
+
+crates:
+  - name: cumulus-client-consensus-aura
+    bump: patch
diff --git a/prdoc/pr_5360.prdoc b/prdoc/pr_5360.prdoc
new file mode 100644
index 000000000000..4b07f30bfd09
--- /dev/null
+++ b/prdoc/pr_5360.prdoc
@@ -0,0 +1,3 @@
+crates:
+  - name: sc-service
+    bump: none
diff --git a/prdoc/pr_5369.prdoc b/prdoc/pr_5369.prdoc
new file mode 100644
index 000000000000..1baa5e1cbe7d
--- /dev/null
+++ b/prdoc/pr_5369.prdoc
@@ -0,0 +1,15 @@
+# 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: Fix failing XCM from relay to Coretime Chain when revenue is zero
+
+doc:
+  - audience: Runtime Dev
+    description: |
+      The coretime assigner now always includes UnpaidExecution when calling `notify_revenue` via a
+      `Transact`, not just when revenue is nonzero. This fixes an issue where the XCM would fail to
+      process on the receiving side.
+
+crates:
+  - name: polkadot-runtime-parachains
+    bump: patch
diff --git a/substrate/bin/node/runtime/src/lib.rs b/substrate/bin/node/runtime/src/lib.rs
index a94838cf20c0..ea9a66862d64 100644
--- a/substrate/bin/node/runtime/src/lib.rs
+++ b/substrate/bin/node/runtime/src/lib.rs
@@ -1612,6 +1612,7 @@ impl pallet_beefy_mmr::Config for Runtime {
 	type BeefyAuthorityToMerkleLeaf = pallet_beefy_mmr::BeefyEcdsaToEthereum;
 	type LeafExtra = Vec<u8>;
 	type BeefyDataProvider = ();
+	type WeightInfo = ();
 }
 
 parameter_types! {
@@ -2585,6 +2586,7 @@ mod benches {
 		[pallet_babe, Babe]
 		[pallet_bags_list, VoterList]
 		[pallet_balances, Balances]
+		[pallet_beefy_mmr, MmrLeaf]
 		[pallet_bounties, Bounties]
 		[pallet_broker, Broker]
 		[pallet_child_bounties, ChildBounties]
@@ -2782,6 +2784,14 @@ impl_runtime_apis! {
 		fn member_needs_delegate_migration(member: AccountId) -> bool {
 			NominationPools::api_member_needs_delegate_migration(member)
 		}
+
+		fn member_total_balance(member: AccountId) -> Balance {
+			NominationPools::api_member_total_balance(member)
+		}
+
+		fn pool_balance(pool_id: pallet_nomination_pools::PoolId) -> Balance {
+			NominationPools::api_pool_balance(pool_id)
+		}
 	}
 
 	impl pallet_staking_runtime_api::StakingApi<Block, Balance, AccountId> for Runtime {
diff --git a/substrate/client/service/src/builder.rs b/substrate/client/service/src/builder.rs
index d7fb7918481c..90bfd9ec27f7 100644
--- a/substrate/client/service/src/builder.rs
+++ b/substrate/client/service/src/builder.rs
@@ -248,10 +248,7 @@ where
 				offchain_worker_enabled: config.offchain_worker.enabled,
 				offchain_indexing_api: config.offchain_worker.indexing_enabled,
 				wasm_runtime_overrides: config.wasm_runtime_overrides.clone(),
-				no_genesis: matches!(
-					config.network.sync_mode,
-					SyncMode::LightState { .. } | SyncMode::Warp { .. }
-				),
+				no_genesis: config.no_genesis(),
 				wasm_runtime_substitutes,
 				enable_import_proof_recording,
 			},
diff --git a/substrate/frame/beefy-mmr/Cargo.toml b/substrate/frame/beefy-mmr/Cargo.toml
index 672a7a68bc7e..d67ac20ee922 100644
--- a/substrate/frame/beefy-mmr/Cargo.toml
+++ b/substrate/frame/beefy-mmr/Cargo.toml
@@ -18,6 +18,7 @@ log = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 serde = { optional = true, workspace = true, default-features = true }
 binary-merkle-tree = { workspace = true }
+frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 pallet-beefy = { workspace = true }
@@ -40,6 +41,7 @@ std = [
 	"array-bytes",
 	"binary-merkle-tree/std",
 	"codec/std",
+	"frame-benchmarking/std",
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
@@ -65,6 +67,7 @@ try-runtime = [
 	"sp-runtime/try-runtime",
 ]
 runtime-benchmarks = [
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-mmr/runtime-benchmarks",
diff --git a/substrate/frame/beefy-mmr/src/benchmarking.rs b/substrate/frame/beefy-mmr/src/benchmarking.rs
new file mode 100644
index 000000000000..135f95eabb99
--- /dev/null
+++ b/substrate/frame/beefy-mmr/src/benchmarking.rs
@@ -0,0 +1,129 @@
+// 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.
+
+//! Beefy pallet benchmarking.
+
+#![cfg(feature = "runtime-benchmarks")]
+
+use super::*;
+use crate::Pallet as BeefyMmr;
+use codec::Encode;
+use frame_benchmarking::v2::*;
+use frame_support::traits::Hooks;
+use frame_system::{Config as SystemConfig, Pallet as System};
+use pallet_mmr::{Nodes, Pallet as Mmr};
+use sp_consensus_beefy::Payload;
+use sp_runtime::traits::One;
+
+pub trait Config:
+	pallet_mmr::Config<Hashing = sp_consensus_beefy::MmrHashing> + crate::Config
+{
+}
+
+impl<T> Config for T where
+	T: pallet_mmr::Config<Hashing = sp_consensus_beefy::MmrHashing> + crate::Config
+{
+}
+
+fn init_block<T: Config>(block_num: u32) {
+	let block_num = block_num.into();
+	System::<T>::initialize(&block_num, &<T as SystemConfig>::Hash::default(), &Default::default());
+	Mmr::<T>::on_initialize(block_num);
+}
+
+#[benchmarks]
+mod benchmarks {
+	use super::*;
+
+	#[benchmark]
+	fn extract_validation_context() {
+		if !cfg!(feature = "test") {
+			pallet_mmr::UseLocalStorage::<T>::set(true);
+		}
+
+		init_block::<T>(1);
+		let header = System::<T>::finalize();
+		frame_system::BlockHash::<T>::insert(BlockNumberFor::<T>::one(), header.hash());
+
+		let validation_context;
+		#[block]
+		{
+			validation_context =
+				<BeefyMmr<T> as AncestryHelper<HeaderFor<T>>>::extract_validation_context(header);
+		}
+
+		assert!(validation_context.is_some());
+	}
+
+	#[benchmark]
+	fn read_peak() {
+		if !cfg!(feature = "test") {
+			pallet_mmr::UseLocalStorage::<T>::set(true);
+		}
+
+		init_block::<T>(1);
+
+		let peak;
+		#[block]
+		{
+			peak = Nodes::<T>::get(0)
+		}
+
+		assert!(peak.is_some());
+	}
+
+	/// Generate ancestry proofs with `n` nodes and benchmark the verification logic.
+	/// These proofs are inflated, containing all the leafs, so we won't read any peak during
+	/// the verification. We need to account for the peaks separately.
+	#[benchmark]
+	fn n_items_proof_is_non_canonical(n: Linear<2, 512>) {
+		if !cfg!(feature = "test") {
+			pallet_mmr::UseLocalStorage::<T>::set(true);
+		}
+
+		for block_num in 1..=n {
+			init_block::<T>(block_num);
+		}
+		let proof = Mmr::<T>::generate_mock_ancestry_proof().unwrap();
+		assert_eq!(proof.items.len(), n as usize);
+
+		let is_non_canonical;
+		#[block]
+		{
+			is_non_canonical = <BeefyMmr<T> as AncestryHelper<HeaderFor<T>>>::is_non_canonical(
+				&Commitment {
+					payload: Payload::from_single_entry(
+						known_payloads::MMR_ROOT_ID,
+						MerkleRootOf::<T>::default().encode(),
+					),
+					block_number: n.into(),
+					validator_set_id: 0,
+				},
+				proof,
+				Mmr::<T>::mmr_root(),
+			);
+		};
+
+		assert_eq!(is_non_canonical, true);
+	}
+
+	impl_benchmark_test_suite!(
+		Pallet,
+		crate::mock::new_test_ext(Default::default()),
+		crate::mock::Test
+	);
+}
diff --git a/substrate/frame/beefy-mmr/src/lib.rs b/substrate/frame/beefy-mmr/src/lib.rs
index 195bbfbf2f29..73119c3faa9b 100644
--- a/substrate/frame/beefy-mmr/src/lib.rs
+++ b/substrate/frame/beefy-mmr/src/lib.rs
@@ -35,27 +35,34 @@
 
 extern crate alloc;
 
-use sp_runtime::traits::{Convert, Header, Member};
+use sp_runtime::{
+	generic::OpaqueDigestItemId,
+	traits::{Convert, Header, Member},
+	SaturatedConversion,
+};
 
 use alloc::vec::Vec;
 use codec::Decode;
-use pallet_mmr::{primitives::AncestryProof, LeafDataProvider, ParentNumberAndHash};
+use pallet_mmr::{primitives::AncestryProof, LeafDataProvider, NodesUtils, ParentNumberAndHash};
 use sp_consensus_beefy::{
 	known_payloads,
 	mmr::{BeefyAuthoritySet, BeefyDataProvider, BeefyNextAuthoritySet, MmrLeaf, MmrLeafVersion},
-	AncestryHelper, Commitment, ConsensusLog, ValidatorSet as BeefyValidatorSet,
+	AncestryHelper, AncestryHelperWeightInfo, Commitment, ConsensusLog,
+	ValidatorSet as BeefyValidatorSet,
 };
 
-use frame_support::{crypto::ecdsa::ECDSAExt, traits::Get};
+use frame_support::{crypto::ecdsa::ECDSAExt, pallet_prelude::Weight, traits::Get};
 use frame_system::pallet_prelude::{BlockNumberFor, HeaderFor};
 
 pub use pallet::*;
-use sp_runtime::generic::OpaqueDigestItemId;
+pub use weights::WeightInfo;
 
+mod benchmarking;
 #[cfg(test)]
 mod mock;
 #[cfg(test)]
 mod tests;
+mod weights;
 
 /// A BEEFY consensus digest item with MMR root hash.
 pub struct DepositBeefyDigest<T>(core::marker::PhantomData<T>);
@@ -126,6 +133,8 @@ pub mod pallet {
 
 		/// Retrieve arbitrary data that should be added to the mmr leaf
 		type BeefyDataProvider: BeefyDataProvider<Self::LeafExtra>;
+
+		type WeightInfo: WeightInfo;
 	}
 
 	/// Details of current BEEFY authority set.
@@ -263,6 +272,30 @@ where
 	}
 }
 
+impl<T: Config> AncestryHelperWeightInfo<HeaderFor<T>> for Pallet<T>
+where
+	T: pallet_mmr::Config<Hashing = sp_consensus_beefy::MmrHashing>,
+{
+	fn extract_validation_context() -> Weight {
+		<T as Config>::WeightInfo::extract_validation_context()
+	}
+
+	fn is_non_canonical(proof: &<Self as AncestryHelper<HeaderFor<T>>>::Proof) -> Weight {
+		let mmr_utils = NodesUtils::new(proof.leaf_count);
+		let num_peaks = mmr_utils.number_of_peaks();
+
+		// The approximated cost of verifying an ancestry proof with `n` nodes.
+		// We add the previous peaks to the total number of nodes,
+		// since they have to be processed as well.
+		<T as Config>::WeightInfo::n_items_proof_is_non_canonical(
+			proof.items.len().saturating_add(proof.prev_peaks.len()).saturated_into(),
+		)
+		// `n_items_proof_is_non_canonical()` uses inflated proofs that contain all the leafs,
+		// where no peak needs to be read. So we need to also add the cost of reading the peaks.
+		.saturating_add(<T as Config>::WeightInfo::read_peak().saturating_mul(num_peaks))
+	}
+}
+
 impl<T: Config> Pallet<T> {
 	/// Return the currently active BEEFY authority set proof.
 	pub fn authority_set_proof() -> BeefyAuthoritySet<MerkleRootOf<T>> {
diff --git a/substrate/frame/beefy-mmr/src/mock.rs b/substrate/frame/beefy-mmr/src/mock.rs
index 1102f9677aaa..6756c618d706 100644
--- a/substrate/frame/beefy-mmr/src/mock.rs
+++ b/substrate/frame/beefy-mmr/src/mock.rs
@@ -37,6 +37,7 @@ use crate as pallet_beefy_mmr;
 pub use sp_consensus_beefy::{
 	ecdsa_crypto::AuthorityId as BeefyId, mmr::BeefyDataProvider, ConsensusLog, BEEFY_ENGINE_ID,
 };
+use sp_core::offchain::{testing::TestOffchainExt, OffchainDbExt, OffchainWorkerExt};
 
 impl_opaque_keys! {
 	pub struct MockSessionKeys {
@@ -122,6 +123,7 @@ impl pallet_beefy_mmr::Config for Test {
 	type LeafExtra = Vec<u8>;
 
 	type BeefyDataProvider = DummyDataProvider;
+	type WeightInfo = ();
 }
 
 pub struct DummyDataProvider;
@@ -191,5 +193,10 @@ pub fn new_test_ext_raw_authorities(authorities: Vec<(u64, BeefyId)>) -> TestExt
 		.assimilate_storage(&mut t)
 		.unwrap();
 
-	t.into()
+	let mut ext: TestExternalities = t.into();
+	let (offchain, _offchain_state) = TestOffchainExt::with_offchain_db(ext.offchain_db());
+	ext.register_extension(OffchainDbExt::new(offchain.clone()));
+	ext.register_extension(OffchainWorkerExt::new(offchain));
+
+	ext
 }
diff --git a/substrate/frame/beefy-mmr/src/tests.rs b/substrate/frame/beefy-mmr/src/tests.rs
index f99835a1dc0a..b126a01012b4 100644
--- a/substrate/frame/beefy-mmr/src/tests.rs
+++ b/substrate/frame/beefy-mmr/src/tests.rs
@@ -24,10 +24,7 @@ use sp_consensus_beefy::{
 	AncestryHelper, Commitment, Payload, ValidatorSet,
 };
 
-use sp_core::{
-	offchain::{testing::TestOffchainExt, OffchainDbExt, OffchainWorkerExt},
-	H256,
-};
+use sp_core::H256;
 use sp_io::TestExternalities;
 use sp_runtime::{traits::Keccak256, DigestItem};
 
@@ -40,8 +37,6 @@ fn init_block(block: u64, maybe_parent_hash: Option<H256>) {
 	System::initialize(&block, &parent_hash, &Default::default());
 	Session::on_initialize(block);
 	Mmr::on_initialize(block);
-	Beefy::on_initialize(block);
-	BeefyMmr::on_initialize(block);
 }
 
 pub fn beefy_log(log: ConsensusLog<BeefyId>) -> DigestItem {
@@ -211,11 +206,6 @@ fn should_update_authorities() {
 fn extract_validation_context_should_work_correctly() {
 	let mut ext = new_test_ext(vec![1, 2]);
 
-	// Register offchain ext.
-	let (offchain, _offchain_state) = TestOffchainExt::with_offchain_db(ext.offchain_db());
-	ext.register_extension(OffchainDbExt::new(offchain.clone()));
-	ext.register_extension(OffchainWorkerExt::new(offchain));
-
 	ext.execute_with(|| {
 		init_block(1, None);
 		let h1 = System::finalize();
@@ -262,13 +252,8 @@ fn is_non_canonical_should_work_correctly() {
 	});
 	ext.persist_offchain_overlay();
 
-	// Register offchain ext.
-	let (offchain, _offchain_state) = TestOffchainExt::with_offchain_db(ext.offchain_db());
-	ext.register_extension(OffchainDbExt::new(offchain.clone()));
-	ext.register_extension(OffchainWorkerExt::new(offchain));
-
 	ext.execute_with(|| {
-		let valid_proof = Mmr::generate_ancestry_proof(250, None).unwrap();
+		let valid_proof = BeefyMmr::generate_proof(250, None).unwrap();
 		let mut invalid_proof = valid_proof.clone();
 		invalid_proof.items.push((300, Default::default()));
 
@@ -343,7 +328,7 @@ fn is_non_canonical_should_work_correctly() {
 		// - should return false, if the commitment is targeting the canonical chain
 		// - should return true if the commitment is NOT targeting the canonical chain
 		for prev_block_number in 1usize..=500 {
-			let proof = Mmr::generate_ancestry_proof(prev_block_number as u64, None).unwrap();
+			let proof = BeefyMmr::generate_proof(prev_block_number as u64, None).unwrap();
 
 			assert_eq!(
 				BeefyMmr::is_non_canonical(
diff --git a/substrate/frame/beefy-mmr/src/weights.rs b/substrate/frame/beefy-mmr/src/weights.rs
new file mode 100644
index 000000000000..c292f25400cc
--- /dev/null
+++ b/substrate/frame/beefy-mmr/src/weights.rs
@@ -0,0 +1,134 @@
+// 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.
+
+//! Autogenerated weights for `pallet_beefy_mmr`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-08-13, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `runner-696hpswk-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-node
+// 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_beefy_mmr
+// --chain=dev
+// --header=./substrate/HEADER-APACHE2
+// --output=./substrate/frame/beefy-mmr/src/weights.rs
+// --template=./substrate/.maintain/frame-weight-template.hbs
+
+#![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 `pallet_beefy_mmr`.
+pub trait WeightInfo {
+	fn extract_validation_context() -> Weight;
+	fn read_peak() -> Weight;
+	fn n_items_proof_is_non_canonical(n: u32, ) -> Weight;
+}
+
+/// Weights for `pallet_beefy_mmr` using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	/// Storage: `System::BlockHash` (r:1 w:0)
+	/// Proof: `System::BlockHash` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
+	fn extract_validation_context() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `92`
+		//  Estimated: `3509`
+		// Minimum execution time: 7_461_000 picoseconds.
+		Weight::from_parts(7_669_000, 3509)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+	}
+	/// Storage: `Mmr::Nodes` (r:1 w:0)
+	/// Proof: `Mmr::Nodes` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`)
+	fn read_peak() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `333`
+		//  Estimated: `3505`
+		// Minimum execution time: 6_137_000 picoseconds.
+		Weight::from_parts(6_423_000, 3505)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+	}
+	/// Storage: `Mmr::RootHash` (r:1 w:0)
+	/// Proof: `Mmr::RootHash` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	/// Storage: `Mmr::NumberOfLeaves` (r:1 w:0)
+	/// Proof: `Mmr::NumberOfLeaves` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// The range of component `n` is `[2, 512]`.
+	fn n_items_proof_is_non_canonical(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `325`
+		//  Estimated: `1517`
+		// Minimum execution time: 10_687_000 picoseconds.
+		Weight::from_parts(14_851_626, 1517)
+			// Standard Error: 1_455
+			.saturating_add(Weight::from_parts(961_703, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+	}
+}
+
+// For backwards compatibility and tests.
+impl WeightInfo for () {
+	/// Storage: `System::BlockHash` (r:1 w:0)
+	/// Proof: `System::BlockHash` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
+	fn extract_validation_context() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `92`
+		//  Estimated: `3509`
+		// Minimum execution time: 7_461_000 picoseconds.
+		Weight::from_parts(7_669_000, 3509)
+			.saturating_add(RocksDbWeight::get().reads(1_u64))
+	}
+	/// Storage: `Mmr::Nodes` (r:1 w:0)
+	/// Proof: `Mmr::Nodes` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`)
+	fn read_peak() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `333`
+		//  Estimated: `3505`
+		// Minimum execution time: 6_137_000 picoseconds.
+		Weight::from_parts(6_423_000, 3505)
+			.saturating_add(RocksDbWeight::get().reads(1_u64))
+	}
+	/// Storage: `Mmr::RootHash` (r:1 w:0)
+	/// Proof: `Mmr::RootHash` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	/// Storage: `Mmr::NumberOfLeaves` (r:1 w:0)
+	/// Proof: `Mmr::NumberOfLeaves` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// The range of component `n` is `[2, 512]`.
+	fn n_items_proof_is_non_canonical(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `325`
+		//  Estimated: `1517`
+		// Minimum execution time: 10_687_000 picoseconds.
+		Weight::from_parts(14_851_626, 1517)
+			// Standard Error: 1_455
+			.saturating_add(Weight::from_parts(961_703, 0).saturating_mul(n.into()))
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
+	}
+}
diff --git a/substrate/frame/beefy/src/default_weights.rs b/substrate/frame/beefy/src/default_weights.rs
index 70dd3bb02bf1..6b83015459d6 100644
--- a/substrate/frame/beefy/src/default_weights.rs
+++ b/substrate/frame/beefy/src/default_weights.rs
@@ -57,11 +57,6 @@ impl crate::WeightInfo for () {
 			.saturating_add(DbWeight::get().reads(2))
 	}
 
-	// TODO: Calculate
-	fn report_fork_voting(_validator_count: u32, _max_nominators_per_validator: u32) -> Weight {
-		Weight::MAX
-	}
-
 	fn set_new_genesis() -> Weight {
 		DbWeight::get().writes(1)
 	}
diff --git a/substrate/frame/beefy/src/lib.rs b/substrate/frame/beefy/src/lib.rs
index 353ba876c7ed..cf690a9df339 100644
--- a/substrate/frame/beefy/src/lib.rs
+++ b/substrate/frame/beefy/src/lib.rs
@@ -19,21 +19,33 @@
 
 extern crate alloc;
 
+mod default_weights;
+mod equivocation;
+#[cfg(test)]
+mod mock;
+#[cfg(test)]
+mod tests;
+
 use alloc::{boxed::Box, vec::Vec};
 use codec::{Encode, MaxEncodedLen};
+use log;
 
 use frame_support::{
 	dispatch::{DispatchResultWithPostInfo, Pays},
 	pallet_prelude::*,
 	traits::{Get, OneSessionHandler},
-	weights::Weight,
+	weights::{constants::RocksDbWeight as DbWeight, Weight},
 	BoundedSlice, BoundedVec, Parameter,
 };
 use frame_system::{
 	ensure_none, ensure_signed,
 	pallet_prelude::{BlockNumberFor, HeaderFor, OriginFor},
 };
-use log;
+use sp_consensus_beefy::{
+	AncestryHelper, AncestryHelperWeightInfo, AuthorityIndex, BeefyAuthorityId, ConsensusLog,
+	DoubleVotingProof, ForkVotingProof, FutureBlockVotingProof, OnNewValidatorSet, ValidatorSet,
+	BEEFY_ENGINE_ID, GENESIS_AUTHORITY_SET_ID,
+};
 use sp_runtime::{
 	generic::DigestItem,
 	traits::{IsMember, Member, One},
@@ -42,24 +54,10 @@ use sp_runtime::{
 use sp_session::{GetSessionNumber, GetValidatorCount};
 use sp_staking::{offence::OffenceReportSystem, SessionIndex};
 
-use sp_consensus_beefy::{
-	AncestryHelper, AuthorityIndex, BeefyAuthorityId, ConsensusLog, DoubleVotingProof,
-	ForkVotingProof, FutureBlockVotingProof, OnNewValidatorSet, ValidatorSet, BEEFY_ENGINE_ID,
-	GENESIS_AUTHORITY_SET_ID,
-};
-
-mod default_weights;
-mod equivocation;
-#[cfg(test)]
-mod mock;
-#[cfg(test)]
-mod tests;
-
+use crate::equivocation::EquivocationEvidenceFor;
 pub use crate::equivocation::{EquivocationOffence, EquivocationReportSystem, TimeSlot};
 pub use pallet::*;
 
-use crate::equivocation::EquivocationEvidenceFor;
-
 const LOG_TARGET: &str = "runtime::beefy";
 
 #[frame_support::pallet]
@@ -102,7 +100,8 @@ pub mod pallet {
 		type OnNewValidatorSet: OnNewValidatorSet<<Self as Config>::BeefyId>;
 
 		/// Hook for checking commitment canonicity.
-		type AncestryHelper: AncestryHelper<HeaderFor<Self>>;
+		type AncestryHelper: AncestryHelper<HeaderFor<Self>>
+			+ AncestryHelperWeightInfo<HeaderFor<Self>>;
 
 		/// Weights for this pallet.
 		type WeightInfo: WeightInfo;
@@ -295,9 +294,10 @@ pub mod pallet {
 		/// and validate the given key ownership proof against the extracted offender.
 		/// If both are valid, the offence will be reported.
 		#[pallet::call_index(3)]
-		#[pallet::weight(T::WeightInfo::report_fork_voting(
+		#[pallet::weight(T::WeightInfo::report_fork_voting::<T>(
 			key_owner_proof.validator_count(),
 			T::MaxNominators::get(),
+			&equivocation_proof.ancestry_proof
 		))]
 		pub fn report_fork_voting(
 			origin: OriginFor<T>,
@@ -329,9 +329,10 @@ pub mod pallet {
 		/// if the block author is defined it will be defined as the equivocation
 		/// reporter.
 		#[pallet::call_index(4)]
-		#[pallet::weight(T::WeightInfo::report_fork_voting(
+		#[pallet::weight(T::WeightInfo::report_fork_voting::<T>(
 			key_owner_proof.validator_count(),
 			T::MaxNominators::get(),
+			&equivocation_proof.ancestry_proof
 		))]
 		pub fn report_fork_voting_unsigned(
 			origin: OriginFor<T>,
@@ -358,7 +359,7 @@ pub mod pallet {
 		/// and validate the given key ownership proof against the extracted offender.
 		/// If both are valid, the offence will be reported.
 		#[pallet::call_index(5)]
-		#[pallet::weight(T::WeightInfo::report_fork_voting(
+		#[pallet::weight(T::WeightInfo::report_future_block_voting(
 			key_owner_proof.validator_count(),
 			T::MaxNominators::get(),
 		))]
@@ -389,7 +390,7 @@ pub mod pallet {
 		/// if the block author is defined it will be defined as the equivocation
 		/// reporter.
 		#[pallet::call_index(6)]
-		#[pallet::weight(T::WeightInfo::report_fork_voting(
+		#[pallet::weight(T::WeightInfo::report_future_block_voting(
 			key_owner_proof.validator_count(),
 			T::MaxNominators::get(),
 		))]
@@ -740,15 +741,52 @@ pub trait WeightInfo {
 		validator_count: u32,
 		max_nominators_per_validator: u32,
 	) -> Weight;
+
+	fn set_new_genesis() -> Weight;
+}
+
+pub(crate) trait WeightInfoExt: WeightInfo {
 	fn report_double_voting(validator_count: u32, max_nominators_per_validator: u32) -> Weight {
 		Self::report_voting_equivocation(2, validator_count, max_nominators_per_validator)
 	}
-	fn report_fork_voting(validator_count: u32, max_nominators_per_validator: u32) -> Weight;
+
+	fn report_fork_voting<T: Config>(
+		validator_count: u32,
+		max_nominators_per_validator: u32,
+		ancestry_proof: &<T::AncestryHelper as AncestryHelper<HeaderFor<T>>>::Proof,
+	) -> Weight {
+		let _weight = <T::AncestryHelper as AncestryHelperWeightInfo<HeaderFor<T>>>::extract_validation_context()
+			.saturating_add(
+				<T::AncestryHelper as AncestryHelperWeightInfo<HeaderFor<T>>>::is_non_canonical(
+					ancestry_proof,
+				),
+			)
+			.saturating_add(Self::report_voting_equivocation(
+				1,
+				validator_count,
+				max_nominators_per_validator,
+			));
+
+		// TODO: https://github.com/paritytech/polkadot-sdk/issues/4523 - return `_weight` here.
+		// We return `Weight::MAX` currently in order to disallow this extrinsic for the moment.
+		// We need to check that the proof is optimal.
+		Weight::MAX
+	}
+
 	fn report_future_block_voting(
 		validator_count: u32,
 		max_nominators_per_validator: u32,
 	) -> Weight {
-		Self::report_voting_equivocation(1, validator_count, max_nominators_per_validator)
+		// checking if the report is for a future block
+		DbWeight::get()
+			.reads(1)
+			// check and report the equivocated vote
+			.saturating_add(Self::report_voting_equivocation(
+				1,
+				validator_count,
+				max_nominators_per_validator,
+			))
 	}
-	fn set_new_genesis() -> Weight;
 }
+
+impl<T> WeightInfoExt for T where T: WeightInfo {}
diff --git a/substrate/frame/beefy/src/mock.rs b/substrate/frame/beefy/src/mock.rs
index b423fa0bda89..5c79d8f7d7d7 100644
--- a/substrate/frame/beefy/src/mock.rs
+++ b/substrate/frame/beefy/src/mock.rs
@@ -21,12 +21,13 @@ use std::vec;
 
 use frame_election_provider_support::{
 	bounds::{ElectionBounds, ElectionBoundsBuilder},
-	onchain, SequentialPhragmen,
+	onchain, SequentialPhragmen, Weight,
 };
 use frame_support::{
 	construct_runtime, derive_impl, parameter_types,
 	traits::{ConstU32, ConstU64, KeyOwnerProofSystem, OnFinalize, OnInitialize},
 };
+use frame_system::pallet_prelude::HeaderFor;
 use pallet_session::historical as pallet_session_historical;
 use sp_core::{crypto::KeyTypeId, ConstU128};
 use sp_runtime::{
@@ -43,7 +44,7 @@ use sp_state_machine::BasicExternalities;
 use crate as pallet_beefy;
 
 pub use sp_consensus_beefy::{ecdsa_crypto::AuthorityId as BeefyId, ConsensusLog, BEEFY_ENGINE_ID};
-use sp_consensus_beefy::{AncestryHelper, Commitment};
+use sp_consensus_beefy::{AncestryHelper, AncestryHelperWeightInfo, Commitment};
 
 impl_opaque_keys! {
 	pub struct MockSessionKeys {
@@ -131,6 +132,16 @@ impl<Header: HeaderT> AncestryHelper<Header> for MockAncestryHelper {
 	}
 }
 
+impl<Header: HeaderT> AncestryHelperWeightInfo<Header> for MockAncestryHelper {
+	fn extract_validation_context() -> Weight {
+		unimplemented!()
+	}
+
+	fn is_non_canonical(_proof: &<Self as AncestryHelper<HeaderFor<Test>>>::Proof) -> Weight {
+		unimplemented!()
+	}
+}
+
 impl pallet_beefy::Config for Test {
 	type BeefyId = BeefyId;
 	type MaxAuthorities = ConstU32<100>;
diff --git a/substrate/frame/beefy/src/tests.rs b/substrate/frame/beefy/src/tests.rs
index a63b3532b698..d75237205cac 100644
--- a/substrate/frame/beefy/src/tests.rs
+++ b/substrate/frame/beefy/src/tests.rs
@@ -35,7 +35,7 @@ use sp_consensus_beefy::{
 use sp_runtime::DigestItem;
 use sp_session::MembershipProof;
 
-use crate::{self as beefy, mock::*, Call, Config, Error, WeightInfo};
+use crate::{self as beefy, mock::*, Call, Config, Error, WeightInfoExt};
 
 fn init_block(block: u64) {
 	System::set_block_number(block);
@@ -765,7 +765,9 @@ fn report_double_voting_has_valid_weight() {
 	// the weight depends on the size of the validator set,
 	// but there's a lower bound of 100 validators.
 	assert!((1..=100)
-		.map(|validators| <Test as Config>::WeightInfo::report_double_voting(validators, 1000))
+		.map(|validators| <<Test as Config>::WeightInfo as WeightInfoExt>::report_double_voting(
+			validators, 1000
+		))
 		.collect::<Vec<_>>()
 		.windows(2)
 		.all(|w| w[0] == w[1]));
@@ -773,7 +775,9 @@ fn report_double_voting_has_valid_weight() {
 	// after 100 validators the weight should keep increasing
 	// with every extra validator.
 	assert!((100..=1000)
-		.map(|validators| <Test as Config>::WeightInfo::report_double_voting(validators, 1000))
+		.map(|validators| <<Test as Config>::WeightInfo as WeightInfoExt>::report_double_voting(
+			validators, 1000
+		))
 		.collect::<Vec<_>>()
 		.windows(2)
 		.all(|w| w[0].ref_time() < w[1].ref_time()));
diff --git a/substrate/frame/delegated-staking/Cargo.toml b/substrate/frame/delegated-staking/Cargo.toml
index 1bd17c59f1e7..8d5ccd342b6b 100644
--- a/substrate/frame/delegated-staking/Cargo.toml
+++ b/substrate/frame/delegated-staking/Cargo.toml
@@ -18,6 +18,8 @@ frame-system = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 sp-runtime = { workspace = true }
 sp-staking = { workspace = true }
+sp-io = { workspace = true }
+log = { workspace = true }
 
 [dev-dependencies]
 sp-core = { workspace = true, default-features = true }
@@ -38,6 +40,7 @@ std = [
 	"frame-election-provider-support/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 	"pallet-balances/std",
 	"pallet-nomination-pools/std",
 	"pallet-staking/std",
diff --git a/substrate/frame/delegated-staking/src/impls.rs b/substrate/frame/delegated-staking/src/impls.rs
index 8c05b0bcfc22..4e6812dee249 100644
--- a/substrate/frame/delegated-staking/src/impls.rs
+++ b/substrate/frame/delegated-staking/src/impls.rs
@@ -19,7 +19,7 @@
 //! Implementations of public traits, namely [`DelegationInterface`] and [`OnStakingUpdate`].
 
 use super::*;
-use sp_staking::{Agent, DelegationInterface, DelegationMigrator, Delegator, OnStakingUpdate};
+use sp_staking::{DelegationInterface, DelegationMigrator, OnStakingUpdate};
 
 impl<T: Config> DelegationInterface for Pallet<T> {
 	type Balance = BalanceOf<T>;
diff --git a/substrate/frame/delegated-staking/src/lib.rs b/substrate/frame/delegated-staking/src/lib.rs
index 1882989cfa7d..7b8d14b0a611 100644
--- a/substrate/frame/delegated-staking/src/lib.rs
+++ b/substrate/frame/delegated-staking/src/lib.rs
@@ -126,6 +126,7 @@
 #![deny(rustdoc::broken_intra_doc_links)]
 
 mod impls;
+pub mod migration;
 #[cfg(test)]
 mod mock;
 #[cfg(test)]
@@ -148,16 +149,29 @@ use frame_support::{
 			},
 			Balanced, Inspect as FunInspect, Mutate as FunMutate,
 		},
-		tokens::{fungible::Credit, Fortitude, Precision, Preservation},
+		tokens::{fungible::Credit, Fortitude, Precision, Preservation, Restriction},
 		Defensive, DefensiveOption, Imbalance, OnUnbalanced,
 	},
 };
+use sp_io::hashing::blake2_256;
 use sp_runtime::{
-	traits::{AccountIdConversion, CheckedAdd, CheckedSub, Zero},
+	traits::{CheckedAdd, CheckedSub, TrailingZeroInput, Zero},
 	ArithmeticError, DispatchResult, Perbill, RuntimeDebug, Saturating,
 };
 use sp_staking::{Agent, Delegator, EraIndex, StakingInterface, StakingUnchecked};
 
+/// The log target of this pallet.
+pub const LOG_TARGET: &str = "runtime::delegated-staking";
+// syntactic sugar for logging.
+#[macro_export]
+macro_rules! log {
+	($level:tt, $patter:expr $(, $values:expr)* $(,)?) => {
+		log::$level!(
+			target: $crate::LOG_TARGET,
+			concat!("[{:?}] 🏊‍♂️ ", $patter), <frame_system::Pallet<T>>::block_number() $(, $values)*
+		)
+	};
+}
 pub type BalanceOf<T> =
 	<<T as Config>::Currency as FunInspect<<T as frame_system::Config>::AccountId>>::Balance;
 
@@ -319,9 +333,7 @@ pub mod pallet {
 				Error::<T>::NotAllowed
 			);
 
-			// remove provider reference
-			let _ = frame_system::Pallet::<T>::dec_providers(&who)?;
-			<Agents<T>>::remove(who);
+			AgentLedger::<T>::remove(&who);
 			Ok(())
 		}
 
@@ -392,9 +404,6 @@ pub mod pallet {
 		) -> DispatchResult {
 			let agent = ensure_signed(origin)?;
 
-			// Ensure they have minimum delegation.
-			ensure!(amount >= T::Currency::minimum_balance(), Error::<T>::NotEnoughFunds);
-
 			// Ensure delegator is sane.
 			ensure!(!Self::is_agent(&delegator), Error::<T>::NotAllowed);
 			ensure!(!Self::is_delegator(&delegator), Error::<T>::NotAllowed);
@@ -468,7 +477,9 @@ impl<T: Config> Pallet<T> {
 
 	/// Derive a (keyless) pot account from the given agent account and account type.
 	fn sub_account(account_type: AccountType, acc: T::AccountId) -> T::AccountId {
-		T::PalletId::get().into_sub_account_truncating((account_type, acc.clone()))
+		let entropy = (T::PalletId::get(), acc, account_type).using_encoded(blake2_256);
+		Decode::decode(&mut TrailingZeroInput::new(entropy.as_ref()))
+			.expect("infinite length input; no invalid inputs for type; qed")
 	}
 
 	/// Held balance of a delegator.
@@ -493,13 +504,8 @@ impl<T: Config> Pallet<T> {
 
 	/// Registers a new agent in the system.
 	fn do_register_agent(who: &T::AccountId, reward_account: &T::AccountId) {
+		// TODO: Consider taking a deposit for being an agent.
 		AgentLedger::<T>::new(reward_account).update(who);
-
-		// Agent does not hold balance of its own but this pallet will provide for this to exist.
-		// This is expected to be a keyless account and not created by any user directly so safe.
-		// TODO: Someday if we allow anyone to be an agent, we should take a deposit for
-		// being a delegator.
-		frame_system::Pallet::<T>::inc_providers(who);
 	}
 
 	/// Migrate existing staker account `who` to an `Agent` account.
@@ -510,9 +516,6 @@ impl<T: Config> Pallet<T> {
 		// transferred to actual delegator.
 		let proxy_delegator = Self::generate_proxy_delegator(Agent::from(who.clone()));
 
-		// Keep proxy delegator alive until all funds are migrated.
-		frame_system::Pallet::<T>::inc_providers(&proxy_delegator.clone().get());
-
 		// Get current stake
 		let stake = T::CoreStaking::stake(who)?;
 
@@ -534,7 +537,6 @@ impl<T: Config> Pallet<T> {
 		T::CoreStaking::set_payee(who, reward_account)?;
 		// delegate all transferred funds back to agent.
 		Self::do_delegate(proxy_delegator, Agent::from(who.clone()), amount_to_transfer)?;
-
 		// if the transferred/delegated amount was greater than the stake, mark the extra as
 		// unclaimed withdrawal.
 		let unclaimed_withdraws = amount_to_transfer
@@ -578,21 +580,23 @@ impl<T: Config> Pallet<T> {
 		let delegator = delegator.get();
 
 		let mut ledger = AgentLedger::<T>::get(&agent).ok_or(Error::<T>::NotAgent)?;
+
+		if let Some(mut existing_delegation) = Delegation::<T>::get(&delegator) {
+			ensure!(existing_delegation.agent == agent, Error::<T>::InvalidDelegation);
+			// update amount and return the updated delegation.
+			existing_delegation.amount = existing_delegation
+				.amount
+				.checked_add(&amount)
+				.ok_or(ArithmeticError::Overflow)?;
+			existing_delegation
+		} else {
+			Delegation::<T>::new(&agent, amount)
+		}
+		.update(&delegator);
+
 		// try to hold the funds.
 		T::Currency::hold(&HoldReason::StakingDelegation.into(), &delegator, amount)?;
 
-		let new_delegation_amount =
-			if let Some(existing_delegation) = Delegation::<T>::get(&delegator) {
-				ensure!(existing_delegation.agent == agent, Error::<T>::InvalidDelegation);
-				existing_delegation
-					.amount
-					.checked_add(&amount)
-					.ok_or(ArithmeticError::Overflow)?
-			} else {
-				amount
-			};
-
-		Delegation::<T>::new(&agent, new_delegation_amount).update_or_kill(&delegator);
 		ledger.total_delegated =
 			ledger.total_delegated.checked_add(&amount).ok_or(ArithmeticError::Overflow)?;
 		ledger.update(&agent);
@@ -638,9 +642,6 @@ impl<T: Config> Pallet<T> {
 			.checked_sub(&amount)
 			.defensive_ok_or(ArithmeticError::Overflow)?;
 
-		// remove delegator if nothing delegated anymore
-		delegation.update_or_kill(&delegator);
-
 		let released = T::Currency::release(
 			&HoldReason::StakingDelegation.into(),
 			&delegator,
@@ -650,6 +651,9 @@ impl<T: Config> Pallet<T> {
 
 		defensive_assert!(released == amount, "hold should have been released fully");
 
+		// update delegation.
+		delegation.update(&delegator);
+
 		Self::deposit_event(Event::<T>::Released { agent, delegator, amount });
 
 		Ok(())
@@ -668,49 +672,34 @@ impl<T: Config> Pallet<T> {
 		let mut source_delegation =
 			Delegators::<T>::get(&source_delegator).defensive_ok_or(Error::<T>::BadState)?;
 
-		// some checks that must have already been checked before.
+		// ensure source has enough funds to migrate.
 		ensure!(source_delegation.amount >= amount, Error::<T>::NotEnoughFunds);
 		debug_assert!(
 			!Self::is_delegator(&destination_delegator) && !Self::is_agent(&destination_delegator)
 		);
 
 		let agent = source_delegation.agent.clone();
-		// update delegations
-		Delegation::<T>::new(&agent, amount).update_or_kill(&destination_delegator);
+		// create a new delegation for destination delegator.
+		Delegation::<T>::new(&agent, amount).update(&destination_delegator);
 
 		source_delegation.amount = source_delegation
 			.amount
 			.checked_sub(&amount)
 			.defensive_ok_or(Error::<T>::BadState)?;
 
-		source_delegation.update_or_kill(&source_delegator);
-
-		// release funds from source
-		let released = T::Currency::release(
+		// transfer the held amount in `source_delegator` to `destination_delegator`.
+		let _ = T::Currency::transfer_on_hold(
 			&HoldReason::StakingDelegation.into(),
-			&source_delegator,
-			amount,
-			Precision::BestEffort,
-		)?;
-
-		defensive_assert!(released == amount, "hold should have been released fully");
-
-		// transfer the released amount to `destination_delegator`.
-		let post_balance = T::Currency::transfer(
 			&source_delegator,
 			&destination_delegator,
 			amount,
-			Preservation::Expendable,
-		)
-		.map_err(|_| Error::<T>::BadState)?;
-
-		// if balance is zero, clear provider for source (proxy) delegator.
-		if post_balance == Zero::zero() {
-			let _ = frame_system::Pallet::<T>::dec_providers(&source_delegator).defensive();
-		}
+			Precision::Exact,
+			Restriction::OnHold,
+			Fortitude::Polite,
+		)?;
 
-		// hold the funds again in the new delegator account.
-		T::Currency::hold(&HoldReason::StakingDelegation.into(), &destination_delegator, amount)?;
+		// update source delegation.
+		source_delegation.update(&source_delegator);
 
 		Self::deposit_event(Event::<T>::MigratedDelegation {
 			agent,
@@ -752,7 +741,7 @@ impl<T: Config> Pallet<T> {
 		agent_ledger.remove_slash(actual_slash).save();
 		delegation.amount =
 			delegation.amount.checked_sub(&actual_slash).ok_or(ArithmeticError::Overflow)?;
-		delegation.update_or_kill(&delegator);
+		delegation.update(&delegator);
 
 		if let Some(reporter) = maybe_reporter {
 			let reward_payout: BalanceOf<T> = T::SlashRewardFraction::get() * actual_slash;
@@ -801,18 +790,21 @@ impl<T: Config> Pallet<T> {
 		ledgers: BTreeMap<T::AccountId, AgentLedger<T>>,
 	) -> Result<(), sp_runtime::TryRuntimeError> {
 		for (agent, ledger) in ledgers {
-			ensure!(
-				matches!(
-					T::CoreStaking::status(&agent).expect("agent should be bonded"),
-					sp_staking::StakerStatus::Nominator(_) | sp_staking::StakerStatus::Idle
-				),
-				"agent should be bonded and not validator"
-			);
+			let staked_value = ledger.stakeable_balance();
+
+			if !staked_value.is_zero() {
+				ensure!(
+					matches!(
+						T::CoreStaking::status(&agent).expect("agent should be bonded"),
+						sp_staking::StakerStatus::Nominator(_) | sp_staking::StakerStatus::Idle
+					),
+					"agent should be bonded and not validator"
+				);
+			}
 
 			ensure!(
 				ledger.stakeable_balance() >=
-					T::CoreStaking::total_stake(&agent)
-						.expect("agent should exist as a nominator"),
+					T::CoreStaking::total_stake(&agent).unwrap_or_default(),
 				"Cannot stake more than balance"
 			);
 		}
diff --git a/substrate/frame/delegated-staking/src/migration.rs b/substrate/frame/delegated-staking/src/migration.rs
new file mode 100644
index 000000000000..8bc7312c4eab
--- /dev/null
+++ b/substrate/frame/delegated-staking/src/migration.rs
@@ -0,0 +1,107 @@
+// 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 super::*;
+use frame_support::traits::OnRuntimeUpgrade;
+
+#[cfg(feature = "try-runtime")]
+use sp_runtime::TryRuntimeError;
+
+pub mod unversioned {
+	use super::*;
+	#[cfg(feature = "try-runtime")]
+	use alloc::vec::Vec;
+	use sp_runtime::traits::AccountIdConversion;
+
+	/// Migrates `ProxyDelegator` accounts with better entropy than the old logic which didn't take
+	/// into account all the bytes of the agent account ID.
+	pub struct ProxyDelegatorMigration<T, MaxAgents>(PhantomData<(T, MaxAgents)>);
+
+	impl<T: Config, MaxAgents: Get<u32>> OnRuntimeUpgrade for ProxyDelegatorMigration<T, MaxAgents> {
+		fn on_runtime_upgrade() -> Weight {
+			let mut weight = Weight::zero();
+			let old_proxy_delegator = |agent: T::AccountId| {
+				T::PalletId::get()
+					.into_sub_account_truncating((AccountType::ProxyDelegator, agent.clone()))
+			};
+
+			Agents::<T>::iter_keys().take(MaxAgents::get() as usize).for_each(|agent| {
+				weight.saturating_accrue(T::DbWeight::get().reads_writes(1, 0));
+				let old_proxy = old_proxy_delegator(agent.clone());
+
+				// if delegation does not exist, it does not need to be migrated.
+				if let Some(delegation) = Delegation::<T>::get(&old_proxy) {
+					weight.saturating_accrue(T::DbWeight::get().reads_writes(1, 0));
+
+					let new_proxy =
+						Pallet::<T>::generate_proxy_delegator(Agent::from(agent.clone()));
+
+					// accrue read writes for `do_migrate_delegation`
+					weight.saturating_accrue(T::DbWeight::get().reads_writes(8, 8));
+					let _ = Pallet::<T>::do_migrate_delegation(
+						Delegator::from(old_proxy.clone()),
+						new_proxy.clone(),
+						delegation.amount,
+					)
+					.map_err(|e| {
+						log!(
+							error,
+							"Failed to migrate old proxy delegator {:?} to new proxy {:?} for agent {:?} with error: {:?}",
+								old_proxy,
+								new_proxy,
+								agent,
+								e,
+						);
+					});
+				};
+			});
+
+			log!(info, "Finished migrating old proxy delegator accounts to new ones");
+			weight
+		}
+
+		#[cfg(feature = "try-runtime")]
+		fn post_upgrade(_data: Vec<u8>) -> Result<(), TryRuntimeError> {
+			let mut unmigrated_count = 0;
+			let old_proxy_delegator = |agent: T::AccountId| {
+				T::PalletId::get()
+					.into_sub_account_truncating((AccountType::ProxyDelegator, agent.clone()))
+			};
+
+			Agents::<T>::iter_keys().take(MaxAgents::get() as usize).for_each(|agent| {
+				let old_proxy: T::AccountId = old_proxy_delegator(agent.clone());
+				let held_balance = Pallet::<T>::held_balance_of(Delegator::from(old_proxy.clone()));
+				let delegation = Delegation::<T>::get(&old_proxy);
+				if delegation.is_some() || !held_balance.is_zero() {
+					log!(
+						error,
+						"Old proxy delegator {:?} for agent {:?} is not migrated.",
+						old_proxy,
+						agent,
+					);
+					unmigrated_count += 1;
+				}
+			});
+
+			if unmigrated_count > 0 {
+				Err(TryRuntimeError::Other("Some old proxy delegator accounts are not migrated."))
+			} else {
+				Ok(())
+			}
+		}
+	}
+}
diff --git a/substrate/frame/delegated-staking/src/tests.rs b/substrate/frame/delegated-staking/src/tests.rs
index bc8bc2dccc3c..2c965e18b1b3 100644
--- a/substrate/frame/delegated-staking/src/tests.rs
+++ b/substrate/frame/delegated-staking/src/tests.rs
@@ -334,6 +334,36 @@ fn apply_pending_slash() {
 	});
 }
 
+#[test]
+fn allow_full_amount_to_be_delegated() {
+	ExtBuilder::default().build_and_execute(|| {
+		let agent: AccountId = 200;
+		let reward_acc: AccountId = 201;
+		let delegator: AccountId = 300;
+
+		// set intention to accept delegation.
+		fund(&agent, 1000);
+		assert_ok!(DelegatedStaking::register_agent(RawOrigin::Signed(agent).into(), reward_acc));
+
+		// delegate to this account
+		fund(&delegator, 1000);
+		assert_ok!(DelegatedStaking::delegate_to_agent(
+			RawOrigin::Signed(delegator).into(),
+			agent,
+			1000
+		));
+
+		// verify
+		assert!(DelegatedStaking::is_agent(&agent));
+		assert_eq!(DelegatedStaking::stakeable_balance(Agent::from(agent)), 1000);
+		assert_eq!(
+			Balances::balance_on_hold(&HoldReason::StakingDelegation.into(), &delegator),
+			1000
+		);
+		assert_eq!(DelegatedStaking::held_balance_of(Delegator::from(delegator)), 1000);
+	});
+}
+
 /// Integration tests with pallet-staking.
 mod staking_integration {
 	use super::*;
@@ -625,32 +655,42 @@ mod staking_integration {
 	#[test]
 	fn migration_works() {
 		ExtBuilder::default().build_and_execute(|| {
+			// initial era
+			start_era(1);
+
 			// add a nominator
 			let staked_amount = 4000;
 			let agent_amount = 5000;
-			fund(&200, agent_amount);
+			let agent = 200;
+			fund(&agent, agent_amount);
 
 			assert_ok!(Staking::bond(
-				RuntimeOrigin::signed(200),
+				RuntimeOrigin::signed(agent),
 				staked_amount,
 				RewardDestination::Account(201)
 			));
-			assert_ok!(Staking::nominate(RuntimeOrigin::signed(200), vec![GENESIS_VALIDATOR],));
-			let init_stake = Staking::stake(&200).unwrap();
+			assert_ok!(Staking::nominate(RuntimeOrigin::signed(agent), vec![GENESIS_VALIDATOR],));
+			let init_stake = Staking::stake(&agent).unwrap();
 
 			// scenario: 200 is a pool account, and the stake comes from its 4 delegators (300..304)
 			// in equal parts. lets try to migrate this nominator into delegate based stake.
 
 			// all balance currently is in 200
-			assert_eq!(Balances::free_balance(200), agent_amount);
+			assert_eq!(Balances::free_balance(agent), agent_amount);
 
 			// to migrate, nominator needs to set an account as a proxy delegator where staked funds
 			// will be moved and delegated back to this old nominator account. This should be funded
 			// with at least ED.
 			let proxy_delegator =
-				DelegatedStaking::generate_proxy_delegator(Agent::from(200)).get();
+				DelegatedStaking::generate_proxy_delegator(Agent::from(agent)).get();
 
-			assert_ok!(DelegatedStaking::migrate_to_agent(RawOrigin::Signed(200).into(), 201));
+			assert_ok!(DelegatedStaking::migrate_to_agent(RawOrigin::Signed(agent).into(), 201));
+			// after migration, funds are moved to proxy delegator, still a provider exists.
+			assert_eq!(System::providers(&agent), 1);
+			assert_eq!(Balances::free_balance(agent), 0);
+			// proxy delegator has one provider as well with no free balance.
+			assert_eq!(System::providers(&proxy_delegator), 1);
+			assert_eq!(Balances::free_balance(proxy_delegator), 0);
 
 			// verify all went well
 			let mut expected_proxy_delegated_amount = agent_amount;
@@ -659,12 +699,12 @@ mod staking_integration {
 				expected_proxy_delegated_amount
 			);
 			// stake amount is transferred from delegate to proxy delegator account.
-			assert_eq!(Balances::free_balance(200), 0);
-			assert_eq!(Staking::stake(&200).unwrap(), init_stake);
-			assert_eq!(get_agent_ledger(&200).ledger.effective_balance(), agent_amount);
-			assert_eq!(get_agent_ledger(&200).available_to_bond(), 0);
+			assert_eq!(Balances::free_balance(agent), 0);
+			assert_eq!(Staking::stake(&agent).unwrap(), init_stake);
+			assert_eq!(get_agent_ledger(&agent).ledger.effective_balance(), agent_amount);
+			assert_eq!(get_agent_ledger(&agent).available_to_bond(), 0);
 			assert_eq!(
-				get_agent_ledger(&200).ledger.unclaimed_withdrawals,
+				get_agent_ledger(&agent).ledger.unclaimed_withdrawals,
 				agent_amount - staked_amount
 			);
 
@@ -672,14 +712,15 @@ mod staking_integration {
 			let delegator_share = agent_amount / 4;
 			for delegator in 300..304 {
 				assert_eq!(Balances::free_balance(delegator), 0);
-				// fund them with ED
-				fund(&delegator, ExistentialDeposit::get());
-				// migrate 1/4th amount into each delegator
+				assert_eq!(System::providers(&delegator), 0);
+
+				// No pre-balance needed to migrate delegator.
 				assert_ok!(DelegatedStaking::migrate_delegation(
-					RawOrigin::Signed(200).into(),
+					RawOrigin::Signed(agent).into(),
 					delegator,
 					delegator_share
 				));
+				assert_eq!(System::providers(&delegator), 1);
 				assert_eq!(
 					Balances::balance_on_hold(&HoldReason::StakingDelegation.into(), &delegator),
 					delegator_share
@@ -694,20 +735,123 @@ mod staking_integration {
 				);
 
 				// delegate stake is unchanged.
-				assert_eq!(Staking::stake(&200).unwrap(), init_stake);
-				assert_eq!(get_agent_ledger(&200).ledger.effective_balance(), agent_amount);
-				assert_eq!(get_agent_ledger(&200).available_to_bond(), 0);
+				assert_eq!(Staking::stake(&agent).unwrap(), init_stake);
+				assert_eq!(get_agent_ledger(&agent).ledger.effective_balance(), agent_amount);
+				assert_eq!(get_agent_ledger(&agent).available_to_bond(), 0);
 				assert_eq!(
-					get_agent_ledger(&200).ledger.unclaimed_withdrawals,
+					get_agent_ledger(&agent).ledger.unclaimed_withdrawals,
 					agent_amount - staked_amount
 				);
 			}
 
 			// cannot use migrate delegator anymore
 			assert_noop!(
-				DelegatedStaking::migrate_delegation(RawOrigin::Signed(200).into(), 305, 1),
+				DelegatedStaking::migrate_delegation(RawOrigin::Signed(agent).into(), 305, 1),
 				Error::<T>::NotEnoughFunds
 			);
+
+			// no provider left on proxy delegator since all funds are migrated
+			assert_eq!(System::providers(&proxy_delegator), 0);
+
+			// withdraw all delegations from delegators
+			assert_ok!(Staking::chill(RuntimeOrigin::signed(agent)));
+			assert_ok!(Staking::unbond(RawOrigin::Signed(agent).into(), staked_amount));
+			start_era(4);
+			assert_ok!(Staking::withdraw_unbonded(RawOrigin::Signed(agent).into(), 0));
+			for delegator in 300..304 {
+				assert_ok!(DelegatedStaking::release_delegation(
+					RawOrigin::Signed(agent).into(),
+					delegator,
+					delegator_share,
+					0
+				));
+				// delegator is cleaned up from storage.
+				assert!(!Delegators::<T>::contains_key(delegator));
+				// has free balance now
+				assert_eq!(Balances::free_balance(delegator), delegator_share);
+				// and only one provider as delegator_share > ED
+				assert_eq!(System::providers(&delegator), 1);
+			}
+
+			// Agent can be removed now.
+			assert_ok!(DelegatedStaking::remove_agent(RawOrigin::Signed(agent).into()));
+			// agent is correctly removed.
+			assert!(!Agents::<T>::contains_key(agent));
+			// and no provider left.
+			assert_eq!(System::providers(&agent), 0);
+		});
+	}
+
+	#[test]
+	fn accounts_are_cleaned_up() {
+		ExtBuilder::default().build_and_execute(|| {
+			let agent: AccountId = 200;
+			let reward_acc: AccountId = 201;
+			let delegator: AccountId = 300;
+
+			// set intention to accept delegation.
+			fund(&agent, 1000);
+
+			// Agent is provided since it has balance > ED.
+			assert_eq!(System::providers(&agent), 1);
+			assert_ok!(DelegatedStaking::register_agent(
+				RawOrigin::Signed(agent).into(),
+				reward_acc
+			));
+			// becoming an agent adds another provider.
+			assert_eq!(System::providers(&agent), 2);
+
+			// delegate to this account
+			fund(&delegator, 1000);
+			// account has one provider since its funded.
+			assert_eq!(System::providers(&delegator), 1);
+			assert_ok!(DelegatedStaking::delegate_to_agent(
+				RawOrigin::Signed(delegator).into(),
+				agent,
+				500
+			));
+			// delegator has an extra provider now.
+			assert_eq!(System::providers(&delegator), 2);
+			// all 1000 tokens including ED can be held.
+			assert_ok!(DelegatedStaking::delegate_to_agent(
+				RawOrigin::Signed(delegator).into(),
+				agent,
+				500
+			));
+			// free balance dropping below ED will reduce a provider, but it still has one provider
+			// left.
+			assert_eq!(System::providers(&delegator), 1);
+
+			// withdraw all delegation
+			assert_ok!(Staking::unbond(RawOrigin::Signed(agent).into(), 1000));
+			start_era(4);
+			assert_ok!(Staking::withdraw_unbonded(RawOrigin::Signed(agent).into(), 0));
+
+			// Since delegations are still left, agents cannot be removed yet from storage.
+			assert_noop!(
+				DelegatedStaking::remove_agent(RawOrigin::Signed(agent).into()),
+				Error::<T>::NotAllowed
+			);
+
+			assert_ok!(DelegatedStaking::release_delegation(
+				RawOrigin::Signed(agent).into(),
+				delegator,
+				1000,
+				0
+			));
+
+			// now agents can be removed.
+			assert_ok!(DelegatedStaking::remove_agent(RawOrigin::Signed(agent).into()));
+
+			// agent and delegator provider is decremented.
+			assert_eq!(System::providers(&delegator), 1);
+			assert_eq!(System::providers(&agent), 1);
+
+			// if we transfer all funds, providers are removed.
+			assert_ok!(Balances::transfer_all(RawOrigin::Signed(delegator).into(), 1337, false));
+			assert_ok!(Balances::transfer_all(RawOrigin::Signed(agent).into(), 1337, false));
+			assert_eq!(System::providers(&delegator), 0);
+			assert_eq!(System::providers(&agent), 0);
 		});
 	}
 }
diff --git a/substrate/frame/delegated-staking/src/types.rs b/substrate/frame/delegated-staking/src/types.rs
index aff282774c3c..a78aa3f55906 100644
--- a/substrate/frame/delegated-staking/src/types.rs
+++ b/substrate/frame/delegated-staking/src/types.rs
@@ -64,15 +64,25 @@ impl<T: Config> Delegation<T> {
 			)
 	}
 
-	/// Save self to storage. If the delegation amount is zero, remove the delegation.
-	pub(crate) fn update_or_kill(self, key: &T::AccountId) {
-		// Clean up if no delegation left.
-		if self.amount == Zero::zero() {
-			<Delegators<T>>::remove(key);
-			return
+	/// Save self to storage.
+	///
+	/// If the delegation amount is zero, remove the delegation. Also adds and removes provider
+	/// reference as needed.
+	pub(crate) fn update(self, key: &T::AccountId) {
+		if <Delegators<T>>::contains_key(key) {
+			// Clean up if no delegation left.
+			if self.amount == Zero::zero() {
+				<Delegators<T>>::remove(key);
+				// Remove provider if no delegation left.
+				let _ = frame_system::Pallet::<T>::dec_providers(key).defensive();
+				return
+			}
+		} else {
+			// this is a new delegation. Provide for this account.
+			frame_system::Pallet::<T>::inc_providers(key);
 		}
 
-		<Delegators<T>>::insert(key, self)
+		<Delegators<T>>::insert(key, self);
 	}
 }
 
@@ -118,10 +128,24 @@ impl<T: Config> AgentLedger<T> {
 	}
 
 	/// Save self to storage with the given key.
+	///
+	/// Increments provider count if this is a new agent.
 	pub(crate) fn update(self, key: &T::AccountId) {
+		if !<Agents<T>>::contains_key(key) {
+			// This is a new agent. Provide for this account.
+			frame_system::Pallet::<T>::inc_providers(key);
+		}
 		<Agents<T>>::insert(key, self)
 	}
 
+	/// Remove self from storage.
+	pub(crate) fn remove(key: &T::AccountId) {
+		debug_assert!(<Agents<T>>::contains_key(key), "Agent should exist in storage");
+		<Agents<T>>::remove(key);
+		// Remove provider reference.
+		let _ = frame_system::Pallet::<T>::dec_providers(key).defensive();
+	}
+
 	/// Effective total balance of the `Agent`.
 	///
 	/// This takes into account any slashes reported to `Agent` but unapplied.
diff --git a/substrate/frame/identity/README.md b/substrate/frame/identity/README.md
index 0203656eff46..94b2ae0231d7 100644
--- a/substrate/frame/identity/README.md
+++ b/substrate/frame/identity/README.md
@@ -1,9 +1,11 @@
-# Identity Module
+# pallet-identity
 
-- [`identity::Config`](https://docs.rs/pallet-identity/latest/pallet_identity/trait.Config.html)
-- [`Call`](https://docs.rs/pallet-identity/latest/pallet_identity/enum.Call.html)
+## Identity Pallet
 
-## Overview
+- [`Config`]
+- [`Call`]
+
+### Overview
 
 A federated naming system, allowing for multiple registrars to be added from a specified origin.
 Registrars can set a fee to provide identity-verification service. Anyone can put forth a
@@ -23,32 +25,53 @@ by definition, these have equivalent ownership and each has an individual name.
 The number of registrars should be limited, and the deposit made sufficiently large, to ensure
 no state-bloat attack is viable.
 
-## Interface
+#### Usernames
+
+The pallet provides functionality for username authorities to issue usernames. When an account
+receives a username, they get a default instance of `IdentityInfo`. Usernames also serve as a
+reverse lookup from username to account.
+
+Username authorities are given an allocation by governance to prevent state bloat. Usernames
+impose no cost or deposit on the user.
 
-### Dispatchable Functions
+Users can have multiple usernames that map to the same `AccountId`, however one `AccountId` can
+only map to a single username, known as the *primary*.
 
-#### For general users
+### Interface
+
+#### Dispatchable Functions
+
+##### For General Users
 - `set_identity` - Set the associated identity of an account; a small deposit is reserved if not
   already taken.
 - `clear_identity` - Remove an account's associated identity; the deposit is returned.
 - `request_judgement` - Request a judgement from a registrar, paying a fee.
 - `cancel_request` - Cancel the previous request for a judgement.
+- `accept_username` - Accept a username issued by a username authority.
+- `remove_expired_approval` - Remove a username that was issued but never accepted.
+- `set_primary_username` - Set a given username as an account's primary.
+- `remove_dangling_username` - Remove a username that maps to an account without an identity.
 
-#### For general users with sub-identities
+##### For General Users with Sub-Identities
 - `set_subs` - Set the sub-accounts of an identity.
 - `add_sub` - Add a sub-identity to an identity.
 - `remove_sub` - Remove a sub-identity of an identity.
 - `rename_sub` - Rename a sub-identity of an identity.
 - `quit_sub` - Remove a sub-identity of an identity (called by the sub-identity).
 
-#### For registrars
+##### For Registrars
 - `set_fee` - Set the fee required to be paid for a judgement to be given by the registrar.
 - `set_fields` - Set the fields that a registrar cares about in their judgements.
 - `provide_judgement` - Provide a judgement to an identity.
 
-#### For super-users
+##### For Username Authorities
+- `set_username_for` - Set a username for a given account. The account must approve it.
+
+##### For Superusers
 - `add_registrar` - Add a new registrar to the system.
 - `kill_identity` - Forcibly remove the associated identity; the deposit is lost.
+- `add_username_authority` - Add an account with the ability to issue usernames.
+- `remove_username_authority` - Remove an account with the ability to issue usernames.
 
 [`Call`]: ./enum.Call.html
 [`Config`]: ./trait.Config.html
diff --git a/substrate/frame/merkle-mountain-range/src/lib.rs b/substrate/frame/merkle-mountain-range/src/lib.rs
index 0ab44711bcf5..7dfe95c83361 100644
--- a/substrate/frame/merkle-mountain-range/src/lib.rs
+++ b/substrate/frame/merkle-mountain-range/src/lib.rs
@@ -240,6 +240,11 @@ pub mod pallet {
 	pub type Nodes<T: Config<I>, I: 'static = ()> =
 		StorageMap<_, Identity, NodeIndex, HashOf<T, I>, OptionQuery>;
 
+	/// Helper flag used in the runtime benchmarks for the initial setup.
+	#[cfg(feature = "runtime-benchmarks")]
+	#[pallet::storage]
+	pub type UseLocalStorage<T, I = ()> = StorageValue<_, bool, ValueQuery>;
+
 	#[pallet::hooks]
 	impl<T: Config<I>, I: 'static> Hooks<BlockNumberFor<T>> for Pallet<T, I> {
 		fn on_initialize(_n: BlockNumberFor<T>) -> Weight {
@@ -439,6 +444,14 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		mmr.generate_ancestry_proof(prev_leaf_count)
 	}
 
+	#[cfg(feature = "runtime-benchmarks")]
+	pub fn generate_mock_ancestry_proof() -> Result<primitives::AncestryProof<HashOf<T, I>>, Error>
+	{
+		let leaf_count = Self::block_num_to_leaf_count(<frame_system::Pallet<T>>::block_number())?;
+		let mmr: ModuleMmr<mmr::storage::OffchainStorage, T, I> = mmr::Mmr::new(leaf_count);
+		mmr.generate_mock_ancestry_proof()
+	}
+
 	pub fn verify_ancestry_proof(
 		root: HashOf<T, I>,
 		ancestry_proof: primitives::AncestryProof<HashOf<T, I>>,
diff --git a/substrate/frame/merkle-mountain-range/src/mmr/mmr.rs b/substrate/frame/merkle-mountain-range/src/mmr/mmr.rs
index 2b46357c5072..f9a4580b9bb3 100644
--- a/substrate/frame/merkle-mountain-range/src/mmr/mmr.rs
+++ b/substrate/frame/merkle-mountain-range/src/mmr/mmr.rs
@@ -156,7 +156,7 @@ where
 	}
 
 	/// Return the internal size of the MMR (number of nodes).
-	#[cfg(test)]
+	#[cfg(any(test, feature = "runtime-benchmarks"))]
 	pub fn size(&self) -> NodeIndex {
 		self.mmr.mmr_size()
 	}
@@ -252,4 +252,48 @@ where
 				.collect(),
 		})
 	}
+
+	/// Generate an inflated ancestry proof for the latest leaf in the MMR.
+	///
+	/// The generated proof contains all the leafs in the MMR, so this way we can generate a proof
+	/// with exactly `leaf_count` items.
+	#[cfg(feature = "runtime-benchmarks")]
+	pub fn generate_mock_ancestry_proof(
+		&self,
+	) -> Result<sp_mmr_primitives::AncestryProof<HashOf<T, I>>, Error> {
+		use crate::ModuleMmr;
+		use alloc::vec;
+		use sp_mmr_primitives::mmr_lib::helper;
+
+		let mmr: ModuleMmr<OffchainStorage, T, I> = Mmr::new(self.leaves);
+		let store = <Storage<OffchainStorage, T, I, L>>::default();
+
+		let mut prev_peaks = vec![];
+		for peak_pos in helper::get_peaks(mmr.size()) {
+			let peak = store
+				.get_elem(peak_pos)
+				.map_err(|_| Error::GenerateProof)?
+				.ok_or(Error::GenerateProof)?
+				.hash();
+			prev_peaks.push(peak);
+		}
+
+		let mut proof_items = vec![];
+		for leaf_idx in 0..self.leaves {
+			let leaf_pos = NodesUtils::leaf_index_to_leaf_node_index(leaf_idx);
+			let leaf = store
+				.get_elem(leaf_pos)
+				.map_err(|_| Error::GenerateProof)?
+				.ok_or(Error::GenerateProof)?
+				.hash();
+			proof_items.push((leaf_pos, leaf));
+		}
+
+		Ok(sp_mmr_primitives::AncestryProof {
+			prev_peaks,
+			prev_leaf_count: self.leaves,
+			leaf_count: self.leaves,
+			items: proof_items,
+		})
+	}
 }
diff --git a/substrate/frame/merkle-mountain-range/src/mmr/storage.rs b/substrate/frame/merkle-mountain-range/src/mmr/storage.rs
index a39089801484..02852388b417 100644
--- a/substrate/frame/merkle-mountain-range/src/mmr/storage.rs
+++ b/substrate/frame/merkle-mountain-range/src/mmr/storage.rs
@@ -22,7 +22,6 @@ use codec::Encode;
 use core::iter::Peekable;
 use log::{debug, trace};
 use sp_core::offchain::StorageKind;
-use sp_io::offchain_index;
 use sp_mmr_primitives::{mmr_lib, mmr_lib::helper, utils::NodesUtils};
 
 use crate::{
@@ -47,6 +46,26 @@ pub struct RuntimeStorage;
 /// DOES NOT support adding new items to the MMR.
 pub struct OffchainStorage;
 
+impl OffchainStorage {
+	fn get(key: &[u8]) -> Option<Vec<u8>> {
+		sp_io::offchain::local_storage_get(StorageKind::PERSISTENT, &key)
+	}
+
+	#[cfg(not(feature = "runtime-benchmarks"))]
+	fn set<T: Config<I>, I: 'static>(key: &[u8], value: &[u8]) {
+		sp_io::offchain_index::set(key, value);
+	}
+
+	#[cfg(feature = "runtime-benchmarks")]
+	fn set<T: Config<I>, I: 'static>(key: &[u8], value: &[u8]) {
+		if crate::pallet::UseLocalStorage::<T, I>::get() {
+			sp_io::offchain::local_storage_set(StorageKind::PERSISTENT, key, value);
+		} else {
+			sp_io::offchain_index::set(key, value);
+		}
+	}
+}
+
 /// A storage layer for MMR.
 ///
 /// There are two different implementations depending on the use case.
@@ -78,7 +97,7 @@ where
 			pos, ancestor_leaf_idx, key
 		);
 		// Try to retrieve the element from Off-chain DB.
-		if let Some(elem) = sp_io::offchain::local_storage_get(StorageKind::PERSISTENT, &key) {
+		if let Some(elem) = OffchainStorage::get(&key) {
 			return Ok(codec::Decode::decode(&mut &*elem).ok())
 		}
 
@@ -93,8 +112,7 @@ where
 			pos, ancestor_leaf_idx, ancestor_parent_hash, temp_key
 		);
 		// Retrieve the element from Off-chain DB.
-		Ok(sp_io::offchain::local_storage_get(StorageKind::PERSISTENT, &temp_key)
-			.and_then(|v| codec::Decode::decode(&mut &*v).ok()))
+		Ok(OffchainStorage::get(&temp_key).and_then(|v| codec::Decode::decode(&mut &*v).ok()))
 	}
 }
 
@@ -203,8 +221,7 @@ where
 			target: "runtime::mmr::offchain", "offchain db set: pos {} parent_hash {:?} key {:?}",
 			pos, parent_hash, temp_key
 		);
-		// Indexing API is used to store the full node content.
-		offchain_index::set(&temp_key, &encoded_node);
+		OffchainStorage::set::<T, I>(&temp_key, &encoded_node);
 	}
 }
 
diff --git a/substrate/frame/nfts/src/types.rs b/substrate/frame/nfts/src/types.rs
index 1687a03520af..60d7c639c88c 100644
--- a/substrate/frame/nfts/src/types.rs
+++ b/substrate/frame/nfts/src/types.rs
@@ -193,13 +193,13 @@ pub struct ItemMetadata<Deposit, StringLimit: Get<u32>> {
 #[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, TypeInfo, MaxEncodedLen)]
 pub struct ItemTip<CollectionId, ItemId, AccountId, Amount> {
 	/// The collection of the item.
-	pub(super) collection: CollectionId,
+	pub collection: CollectionId,
 	/// An item of which the tip is sent for.
-	pub(super) item: ItemId,
+	pub item: ItemId,
 	/// A sender of the tip.
-	pub(super) receiver: AccountId,
+	pub receiver: AccountId,
 	/// An amount the sender is willing to tip.
-	pub(super) amount: Amount,
+	pub amount: Amount,
 }
 
 /// Information about the pending swap.
@@ -246,9 +246,9 @@ pub enum PriceDirection {
 #[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, TypeInfo, MaxEncodedLen)]
 pub struct PriceWithDirection<Amount> {
 	/// An amount.
-	pub(super) amount: Amount,
+	pub amount: Amount,
 	/// A direction (send or receive).
-	pub(super) direction: PriceDirection,
+	pub direction: PriceDirection,
 }
 
 /// Support for up to 64 user-enabled features on a collection.
@@ -518,31 +518,31 @@ impl_codec_bitflags!(CollectionRoles, u8, CollectionRole);
 #[derive(Clone, Eq, PartialEq, Encode, Decode, RuntimeDebug, TypeInfo)]
 pub struct PreSignedMint<CollectionId, ItemId, AccountId, Deadline, Balance> {
 	/// A collection of the item to be minted.
-	pub(super) collection: CollectionId,
+	pub collection: CollectionId,
 	/// Item's ID.
-	pub(super) item: ItemId,
+	pub item: ItemId,
 	/// Additional item's key-value attributes.
-	pub(super) attributes: Vec<(Vec<u8>, Vec<u8>)>,
+	pub attributes: Vec<(Vec<u8>, Vec<u8>)>,
 	/// Additional item's metadata.
-	pub(super) metadata: Vec<u8>,
+	pub metadata: Vec<u8>,
 	/// Restrict the claim to a particular account.
-	pub(super) only_account: Option<AccountId>,
+	pub only_account: Option<AccountId>,
 	/// A deadline for the signature.
-	pub(super) deadline: Deadline,
+	pub deadline: Deadline,
 	/// An optional price the claimer would need to pay for the mint.
-	pub(super) mint_price: Option<Balance>,
+	pub mint_price: Option<Balance>,
 }
 
 #[derive(Clone, Eq, PartialEq, Encode, Decode, RuntimeDebug, TypeInfo)]
 pub struct PreSignedAttributes<CollectionId, ItemId, AccountId, Deadline> {
 	/// Collection's ID.
-	pub(super) collection: CollectionId,
+	pub collection: CollectionId,
 	/// Item's ID.
-	pub(super) item: ItemId,
+	pub item: ItemId,
 	/// Key-value attributes.
-	pub(super) attributes: Vec<(Vec<u8>, Vec<u8>)>,
+	pub attributes: Vec<(Vec<u8>, Vec<u8>)>,
 	/// Attributes' namespace.
-	pub(super) namespace: AttributeNamespace<AccountId>,
+	pub namespace: AttributeNamespace<AccountId>,
 	/// A deadline for the signature.
-	pub(super) deadline: Deadline,
+	pub deadline: Deadline,
 }
diff --git a/substrate/frame/nomination-pools/runtime-api/src/lib.rs b/substrate/frame/nomination-pools/runtime-api/src/lib.rs
index 67627e0acb13..d81ad1dd4954 100644
--- a/substrate/frame/nomination-pools/runtime-api/src/lib.rs
+++ b/substrate/frame/nomination-pools/runtime-api/src/lib.rs
@@ -63,5 +63,11 @@ sp_api::decl_runtime_apis! {
 		/// [`migrate_delegation`](pallet_nomination_pools::Call::migrate_delegation)
 		/// to migrate the funds of the pool member.
 		fn member_needs_delegate_migration(member: AccountId) -> bool;
+
+		/// Returns the total contribution of a pool member including any balance that is unbonding.
+		fn member_total_balance(who: AccountId) -> Balance;
+
+		/// Total balance contributed to the pool.
+		fn pool_balance(pool_id: PoolId) -> Balance;
 	}
 }
diff --git a/substrate/frame/nomination-pools/src/lib.rs b/substrate/frame/nomination-pools/src/lib.rs
index 9108060ccb2a..44e3463dc9f2 100644
--- a/substrate/frame/nomination-pools/src/lib.rs
+++ b/substrate/frame/nomination-pools/src/lib.rs
@@ -2010,6 +2010,8 @@ pub mod pallet {
 			pool_id: PoolId,
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
+			// ensure pool is not in an un-migrated state.
+			ensure!(!Self::api_pool_needs_delegate_migration(pool_id), Error::<T>::NotMigrated);
 
 			ensure!(amount >= MinJoinBond::<T>::get(), Error::<T>::MinimumBondNotMet);
 			// If a member already exists that means they already belong to a pool
@@ -2072,6 +2074,13 @@ pub mod pallet {
 		)]
 		pub fn bond_extra(origin: OriginFor<T>, extra: BondExtra<BalanceOf<T>>) -> DispatchResult {
 			let who = ensure_signed(origin)?;
+
+			// ensure who is not in an un-migrated state.
+			ensure!(
+				!Self::api_member_needs_delegate_migration(who.clone()),
+				Error::<T>::NotMigrated
+			);
+
 			Self::do_bond_extra(who.clone(), who, extra)
 		}
 
@@ -2087,6 +2096,12 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::claim_payout())]
 		pub fn claim_payout(origin: OriginFor<T>) -> DispatchResult {
 			let signer = ensure_signed(origin)?;
+			// ensure signer is not in an un-migrated state.
+			ensure!(
+				!Self::api_member_needs_delegate_migration(signer.clone()),
+				Error::<T>::NotMigrated
+			);
+
 			Self::do_claim_payout(signer.clone(), signer)
 		}
 
@@ -2130,6 +2145,12 @@ pub mod pallet {
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			let member_account = T::Lookup::lookup(member_account)?;
+			// ensure member is not in an un-migrated state.
+			ensure!(
+				!Self::api_member_needs_delegate_migration(member_account.clone()),
+				Error::<T>::NotMigrated
+			);
+
 			let (mut member, mut bonded_pool, mut reward_pool) =
 				Self::get_member_with_pools(&member_account)?;
 
@@ -2213,6 +2234,9 @@ pub mod pallet {
 			num_slashing_spans: u32,
 		) -> DispatchResult {
 			let _ = ensure_signed(origin)?;
+			// ensure pool is not in an un-migrated state.
+			ensure!(!Self::api_pool_needs_delegate_migration(pool_id), Error::<T>::NotMigrated);
+
 			let pool = BondedPool::<T>::get(pool_id).ok_or(Error::<T>::PoolNotFound)?;
 
 			// For now we only allow a pool to withdraw unbonded if its not destroying. If the pool
@@ -2259,6 +2283,12 @@ pub mod pallet {
 		) -> DispatchResultWithPostInfo {
 			let caller = ensure_signed(origin)?;
 			let member_account = T::Lookup::lookup(member_account)?;
+			// ensure member is not in an un-migrated state.
+			ensure!(
+				!Self::api_member_needs_delegate_migration(member_account.clone()),
+				Error::<T>::NotMigrated
+			);
+
 			let mut member =
 				PoolMembers::<T>::get(&member_account).ok_or(Error::<T>::PoolMemberNotFound)?;
 			let current_era = T::StakeAdapter::current_era();
@@ -2493,6 +2523,8 @@ pub mod pallet {
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			let bonded_pool = BondedPool::<T>::get(pool_id).ok_or(Error::<T>::PoolNotFound)?;
+			// ensure pool is not in an un-migrated state.
+			ensure!(!Self::api_pool_needs_delegate_migration(pool_id), Error::<T>::NotMigrated);
 			ensure!(bonded_pool.can_nominate(&who), Error::<T>::NotNominator);
 
 			let depositor_points = PoolMembers::<T>::get(&bonded_pool.roles.depositor)
@@ -2527,6 +2559,8 @@ pub mod pallet {
 			let who = ensure_signed(origin)?;
 			let mut bonded_pool = BondedPool::<T>::get(pool_id).ok_or(Error::<T>::PoolNotFound)?;
 			ensure!(bonded_pool.state != PoolState::Destroying, Error::<T>::CanNotChangeState);
+			// ensure pool is not in an un-migrated state.
+			ensure!(!Self::api_pool_needs_delegate_migration(pool_id), Error::<T>::NotMigrated);
 
 			if bonded_pool.can_toggle_state(&who) {
 				bonded_pool.set_state(state);
@@ -2562,6 +2596,8 @@ pub mod pallet {
 					.can_set_metadata(&who),
 				Error::<T>::DoesNotHavePermission
 			);
+			// ensure pool is not in an un-migrated state.
+			ensure!(!Self::api_pool_needs_delegate_migration(pool_id), Error::<T>::NotMigrated);
 
 			Metadata::<T>::mutate(pool_id, |pool_meta| *pool_meta = metadata);
 
@@ -2638,6 +2674,9 @@ pub mod pallet {
 				},
 			};
 
+			// ensure pool is not in an un-migrated state.
+			ensure!(!Self::api_pool_needs_delegate_migration(pool_id), Error::<T>::NotMigrated);
+
 			match new_root {
 				ConfigOp::Noop => (),
 				ConfigOp::Remove => bonded_pool.roles.root = None,
@@ -2684,8 +2723,9 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::chill())]
 		pub fn chill(origin: OriginFor<T>, pool_id: PoolId) -> DispatchResult {
 			let who = ensure_signed(origin)?;
-
 			let bonded_pool = BondedPool::<T>::get(pool_id).ok_or(Error::<T>::PoolNotFound)?;
+			// ensure pool is not in an un-migrated state.
+			ensure!(!Self::api_pool_needs_delegate_migration(pool_id), Error::<T>::NotMigrated);
 
 			let depositor_points = PoolMembers::<T>::get(&bonded_pool.roles.depositor)
 				.ok_or(Error::<T>::PoolMemberNotFound)?
@@ -2720,7 +2760,14 @@ pub mod pallet {
 			extra: BondExtra<BalanceOf<T>>,
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
-			Self::do_bond_extra(who, T::Lookup::lookup(member)?, extra)
+			let member_account = T::Lookup::lookup(member)?;
+			// ensure member is not in an un-migrated state.
+			ensure!(
+				!Self::api_member_needs_delegate_migration(member_account.clone()),
+				Error::<T>::NotMigrated
+			);
+
+			Self::do_bond_extra(who, member_account, extra)
 		}
 
 		/// Allows a pool member to set a claim permission to allow or disallow permissionless
@@ -2737,9 +2784,14 @@ pub mod pallet {
 			permission: ClaimPermission,
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
-
 			ensure!(PoolMembers::<T>::contains_key(&who), Error::<T>::PoolMemberNotFound);
 
+			// ensure member is not in an un-migrated state.
+			ensure!(
+				!Self::api_member_needs_delegate_migration(who.clone()),
+				Error::<T>::NotMigrated
+			);
+
 			ClaimPermissions::<T>::mutate(who, |source| {
 				*source = permission;
 			});
@@ -2755,6 +2807,12 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::claim_payout())]
 		pub fn claim_payout_other(origin: OriginFor<T>, other: T::AccountId) -> DispatchResult {
 			let signer = ensure_signed(origin)?;
+			// ensure member is not in an un-migrated state.
+			ensure!(
+				!Self::api_member_needs_delegate_migration(other.clone()),
+				Error::<T>::NotMigrated
+			);
+
 			Self::do_claim_payout(signer, other)
 		}
 
@@ -2773,6 +2831,9 @@ pub mod pallet {
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			let mut bonded_pool = BondedPool::<T>::get(pool_id).ok_or(Error::<T>::PoolNotFound)?;
+			// ensure pool is not in an un-migrated state.
+			ensure!(!Self::api_pool_needs_delegate_migration(pool_id), Error::<T>::NotMigrated);
+
 			ensure!(bonded_pool.can_manage_commission(&who), Error::<T>::DoesNotHavePermission);
 
 			let mut reward_pool = RewardPools::<T>::get(pool_id)
@@ -2809,6 +2870,9 @@ pub mod pallet {
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			let mut bonded_pool = BondedPool::<T>::get(pool_id).ok_or(Error::<T>::PoolNotFound)?;
+			// ensure pool is not in an un-migrated state.
+			ensure!(!Self::api_pool_needs_delegate_migration(pool_id), Error::<T>::NotMigrated);
+
 			ensure!(bonded_pool.can_manage_commission(&who), Error::<T>::DoesNotHavePermission);
 
 			bonded_pool.commission.try_update_max(pool_id, max_commission)?;
@@ -2831,6 +2895,8 @@ pub mod pallet {
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			let mut bonded_pool = BondedPool::<T>::get(pool_id).ok_or(Error::<T>::PoolNotFound)?;
+			// ensure pool is not in an un-migrated state.
+			ensure!(!Self::api_pool_needs_delegate_migration(pool_id), Error::<T>::NotMigrated);
 			ensure!(bonded_pool.can_manage_commission(&who), Error::<T>::DoesNotHavePermission);
 
 			bonded_pool.commission.try_update_change_rate(change_rate)?;
@@ -2852,6 +2918,9 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::claim_commission())]
 		pub fn claim_commission(origin: OriginFor<T>, pool_id: PoolId) -> DispatchResult {
 			let who = ensure_signed(origin)?;
+			// ensure pool is not in an un-migrated state.
+			ensure!(!Self::api_pool_needs_delegate_migration(pool_id), Error::<T>::NotMigrated);
+
 			Self::do_claim_commission(who, pool_id)
 		}
 
@@ -2866,6 +2935,9 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::adjust_pool_deposit())]
 		pub fn adjust_pool_deposit(origin: OriginFor<T>, pool_id: PoolId) -> DispatchResult {
 			let who = ensure_signed(origin)?;
+			// ensure pool is not in an un-migrated state.
+			ensure!(!Self::api_pool_needs_delegate_migration(pool_id), Error::<T>::NotMigrated);
+
 			Self::do_adjust_pool_deposit(who, pool_id)
 		}
 
@@ -2882,6 +2954,8 @@ pub mod pallet {
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			let mut bonded_pool = BondedPool::<T>::get(pool_id).ok_or(Error::<T>::PoolNotFound)?;
+			// ensure pool is not in an un-migrated state.
+			ensure!(!Self::api_pool_needs_delegate_migration(pool_id), Error::<T>::NotMigrated);
 			ensure!(bonded_pool.can_manage_commission(&who), Error::<T>::DoesNotHavePermission);
 
 			bonded_pool.commission.claim_permission = permission.clone();
@@ -2956,9 +3030,12 @@ pub mod pallet {
 			);
 
 			let pool_contribution = member.total_balance();
-			ensure!(pool_contribution >= MinJoinBond::<T>::get(), Error::<T>::MinimumBondNotMet);
-			// the member must have some contribution to be migrated.
-			ensure!(pool_contribution > Zero::zero(), Error::<T>::AlreadyMigrated);
+			// ensure the pool contribution is greater than the existential deposit otherwise we
+			// cannot transfer funds to member account.
+			ensure!(
+				pool_contribution >= T::Currency::minimum_balance(),
+				Error::<T>::MinimumBondNotMet
+			);
 
 			let delegation =
 				T::StakeAdapter::member_delegation_balance(Member::from(member_account.clone()));
@@ -3459,6 +3536,7 @@ impl<T: Config> Pallet<T> {
 
 	fn do_adjust_pool_deposit(who: T::AccountId, pool: PoolId) -> DispatchResult {
 		let bonded_pool = BondedPool::<T>::get(pool).ok_or(Error::<T>::PoolNotFound)?;
+
 		let reward_acc = &bonded_pool.reward_account();
 		let pre_frozen_balance =
 			T::Currency::balance_frozen(&FreezeReason::PoolMinBalance.into(), reward_acc);
@@ -3880,7 +3958,13 @@ impl<T: Config> Pallet<T> {
 			return false
 		}
 
+		// if pool does not exist, return false.
+		if !BondedPools::<T>::contains_key(pool_id) {
+			return false
+		}
+
 		let pool_account = Self::generate_bonded_account(pool_id);
+
 		// true if pool is still not migrated to `DelegateStake`.
 		T::StakeAdapter::pool_strategy(Pool::from(pool_account)) !=
 			adapter::StakeStrategyType::Delegate
@@ -3914,6 +3998,22 @@ impl<T: Config> Pallet<T> {
 			})
 			.unwrap_or_default()
 	}
+
+	/// Contribution of the member in the pool.
+	///
+	/// Includes balance that is unbonded from staking but not claimed yet from the pool, therefore
+	/// this balance can be higher than the staked funds.
+	pub fn api_member_total_balance(who: T::AccountId) -> BalanceOf<T> {
+		PoolMembers::<T>::get(who.clone())
+			.map(|m| m.total_balance())
+			.unwrap_or_default()
+	}
+
+	/// Total balance contributed to the pool.
+	pub fn api_pool_balance(pool_id: PoolId) -> BalanceOf<T> {
+		T::StakeAdapter::total_balance(Pool::from(Self::generate_bonded_account(pool_id)))
+			.unwrap_or_default()
+	}
 }
 
 impl<T: Config> sp_staking::OnStakingUpdate<T::AccountId, BalanceOf<T>> for Pallet<T> {
diff --git a/substrate/frame/nomination-pools/test-delegate-stake/src/lib.rs b/substrate/frame/nomination-pools/test-delegate-stake/src/lib.rs
index a50a6b73f5fc..7fee2a0bdb23 100644
--- a/substrate/frame/nomination-pools/test-delegate-stake/src/lib.rs
+++ b/substrate/frame/nomination-pools/test-delegate-stake/src/lib.rs
@@ -25,16 +25,16 @@ use frame_support::{
 };
 use mock::*;
 use pallet_nomination_pools::{
-	BondExtra, BondedPools, Error as PoolsError, Event as PoolsEvent, LastPoolId, PoolMember,
-	PoolMembers, PoolState,
+	BondExtra, BondedPools, CommissionChangeRate, ConfigOp, Error as PoolsError,
+	Event as PoolsEvent, LastPoolId, PoolMember, PoolMembers, PoolState,
 };
 use pallet_staking::{
 	CurrentEra, Error as StakingError, Event as StakingEvent, Payee, RewardDestination,
 };
 
-use pallet_delegated_staking::{Error as DelegatedStakingError, Event as DelegatedStakingEvent};
+use pallet_delegated_staking::Event as DelegatedStakingEvent;
 
-use sp_runtime::{bounded_btree_map, traits::Zero};
+use sp_runtime::{bounded_btree_map, traits::Zero, Perbill};
 use sp_staking::Agent;
 
 #[test]
@@ -999,7 +999,6 @@ fn pool_migration_e2e() {
 		LegacyAdapter::set(false);
 
 		// cannot migrate the member delegation unless pool is migrated first.
-		assert!(!Pools::api_member_needs_delegate_migration(20));
 		assert_noop!(
 			Pools::migrate_delegation(RuntimeOrigin::signed(10), 20),
 			PoolsError::<Runtime>::NotMigrated
@@ -1031,13 +1030,17 @@ fn pool_migration_e2e() {
 
 		// move to era 5 when 20 can withdraw unbonded funds.
 		CurrentEra::<Runtime>::set(Some(5));
-		// Unbond works even without claiming delegation. Lets unbond 22.
-		assert_ok!(Pools::unbond(RuntimeOrigin::signed(22), 22, 5));
+
+		// Cannot unbond without claiming delegation. Lets unbond 22.
+		assert_noop!(
+			Pools::unbond(RuntimeOrigin::signed(22), 22, 5),
+			PoolsError::<Runtime>::NotMigrated
+		);
 
 		// withdraw fails for 20 before claiming delegation
 		assert_noop!(
 			Pools::withdraw_unbonded(RuntimeOrigin::signed(20), 20, 10),
-			DelegatedStakingError::<Runtime>::NotDelegator
+			PoolsError::<Runtime>::NotMigrated
 		);
 
 		let pre_claim_balance_20 = Balances::total_balance(&20);
@@ -1060,17 +1063,11 @@ fn pool_migration_e2e() {
 
 		assert_eq!(
 			staking_events_since_last_call(),
-			vec![
-				StakingEvent::Unbonded { stash: POOL1_BONDED, amount: 5 },
-				StakingEvent::Withdrawn { stash: POOL1_BONDED, amount: 5 }
-			]
+			vec![StakingEvent::Withdrawn { stash: POOL1_BONDED, amount: 5 }]
 		);
 		assert_eq!(
 			pool_events_since_last_call(),
-			vec![
-				PoolsEvent::Unbonded { member: 22, pool_id: 1, balance: 5, points: 5, era: 8 },
-				PoolsEvent::Withdrawn { member: 20, pool_id: 1, balance: 5, points: 5 },
-			]
+			vec![PoolsEvent::Withdrawn { member: 20, pool_id: 1, balance: 5, points: 5 },]
 		);
 		assert_eq!(
 			delegated_staking_events_since_last_call(),
@@ -1113,8 +1110,9 @@ fn pool_migration_e2e() {
 		assert_eq!(Balances::total_balance(&21), pre_migrate_balance_21 + 10);
 
 		// MIGRATE 22
-		let pre_migrate_balance_22 = Balances::total_balance(&22);
 		assert_eq!(Balances::total_balance_on_hold(&22), 0);
+		// make balance of 22 as 0.
+		let _ = Balances::make_free_balance_be(&22, 0);
 
 		// migrate delegation for 22.
 		assert!(Pools::api_member_needs_delegate_migration(22));
@@ -1128,17 +1126,20 @@ fn pool_migration_e2e() {
 		);
 
 		// tokens moved to 22's account and held there.
-		assert_eq!(Balances::total_balance(&22), pre_migrate_balance_22 + 10);
+		assert_eq!(Balances::total_balance(&22), 10);
 		assert_eq!(Balances::total_balance_on_hold(&22), 10);
 
-		// withdraw fails since 22 only unbonds at era 8.
+		// unbond 22 should work now
+		assert_ok!(Pools::unbond(RuntimeOrigin::signed(22), 22, 5));
+
+		// withdraw fails since 22 only unbonds after era 9.
 		assert_noop!(
 			Pools::withdraw_unbonded(RuntimeOrigin::signed(22), 22, 5),
 			PoolsError::<Runtime>::CannotWithdrawAny
 		);
 
 		// go to era when 22 can unbond
-		CurrentEra::<Runtime>::set(Some(10));
+		CurrentEra::<Runtime>::set(Some(9));
 
 		// withdraw works now
 		assert_ok!(Pools::withdraw_unbonded(RuntimeOrigin::signed(22), 22, 10));
@@ -1151,6 +1152,7 @@ fn pool_migration_e2e() {
 			staking_events_since_last_call(),
 			vec![
 				StakingEvent::Withdrawn { stash: POOL1_BONDED, amount: 10 },
+				StakingEvent::Unbonded { stash: POOL1_BONDED, amount: 5 },
 				StakingEvent::Withdrawn { stash: POOL1_BONDED, amount: 5 }
 			]
 		);
@@ -1161,6 +1163,7 @@ fn pool_migration_e2e() {
 				PoolsEvent::Withdrawn { member: 21, pool_id: 1, balance: 10, points: 10 },
 				// 21 was fully unbonding and removed from pool.
 				PoolsEvent::MemberRemoved { member: 21, pool_id: 1, released_balance: 0 },
+				PoolsEvent::Unbonded { member: 22, pool_id: 1, balance: 5, points: 5, era: 9 },
 				PoolsEvent::Withdrawn { member: 22, pool_id: 1, balance: 5, points: 5 },
 			]
 		);
@@ -1184,6 +1187,183 @@ fn pool_migration_e2e() {
 	})
 }
 
+#[test]
+fn disable_pool_operations_on_non_migrated() {
+	new_test_ext().execute_with(|| {
+		LegacyAdapter::set(true);
+		assert_eq!(Balances::minimum_balance(), 5);
+		assert_eq!(Staking::current_era(), None);
+
+		// create the pool with TransferStake strategy.
+		assert_ok!(Pools::create(RuntimeOrigin::signed(10), 50, 10, 10, 10));
+		assert_eq!(LastPoolId::<Runtime>::get(), 1);
+
+		// have the pool nominate.
+		assert_ok!(Pools::nominate(RuntimeOrigin::signed(10), 1, vec![1, 2, 3]));
+
+		assert_eq!(
+			staking_events_since_last_call(),
+			vec![StakingEvent::Bonded { stash: POOL1_BONDED, amount: 50 }]
+		);
+		assert_eq!(
+			pool_events_since_last_call(),
+			vec![
+				PoolsEvent::Created { depositor: 10, pool_id: 1 },
+				PoolsEvent::Bonded { member: 10, pool_id: 1, bonded: 50, joined: true },
+			]
+		);
+
+		let pre_20 = Balances::free_balance(20);
+		assert_ok!(Pools::join(RuntimeOrigin::signed(20), 10, 1));
+
+		// verify members balance is moved to pool.
+		assert_eq!(Balances::free_balance(20), pre_20 - 10);
+
+		assert_eq!(
+			staking_events_since_last_call(),
+			vec![StakingEvent::Bonded { stash: POOL1_BONDED, amount: 10 },]
+		);
+		assert_eq!(
+			pool_events_since_last_call(),
+			vec![PoolsEvent::Bonded { member: 20, pool_id: 1, bonded: 10, joined: true },]
+		);
+
+		// we reset the adapter to `DelegateStake`.
+		LegacyAdapter::set(false);
+
+		// pool is pending migration.
+		assert!(Pools::api_pool_needs_delegate_migration(1));
+
+		// ensure pool mutation is not allowed until pool is migrated.
+		assert_noop!(
+			Pools::join(RuntimeOrigin::signed(21), 10, 1),
+			PoolsError::<Runtime>::NotMigrated
+		);
+		assert_noop!(
+			Pools::pool_withdraw_unbonded(RuntimeOrigin::signed(10), 1, 0),
+			PoolsError::<Runtime>::NotMigrated
+		);
+		assert_noop!(
+			Pools::nominate(RuntimeOrigin::signed(10), 1, vec![1, 2, 3]),
+			PoolsError::<Runtime>::NotMigrated
+		);
+		assert_noop!(
+			Pools::set_state(RuntimeOrigin::signed(10), 1, PoolState::Blocked),
+			PoolsError::<Runtime>::NotMigrated
+		);
+		assert_noop!(
+			Pools::set_metadata(RuntimeOrigin::signed(10), 1, vec![1, 1]),
+			PoolsError::<Runtime>::NotMigrated
+		);
+		assert_noop!(
+			Pools::update_roles(
+				RuntimeOrigin::signed(10),
+				1,
+				ConfigOp::Set(5),
+				ConfigOp::Set(6),
+				ConfigOp::Set(7)
+			),
+			PoolsError::<Runtime>::NotMigrated
+		);
+		assert_noop!(
+			Pools::chill(RuntimeOrigin::signed(10), 1),
+			PoolsError::<Runtime>::NotMigrated
+		);
+		assert_noop!(
+			Pools::set_commission(RuntimeOrigin::signed(10), 1, None),
+			PoolsError::<Runtime>::NotMigrated
+		);
+		assert_noop!(
+			Pools::set_commission_max(RuntimeOrigin::signed(10), 1, Zero::zero()),
+			PoolsError::<Runtime>::NotMigrated
+		);
+		assert_noop!(
+			Pools::set_commission_change_rate(
+				RuntimeOrigin::signed(10),
+				1,
+				CommissionChangeRate { max_increase: Perbill::from_percent(1), min_delay: 2_u64 }
+			),
+			PoolsError::<Runtime>::NotMigrated
+		);
+		assert_noop!(
+			Pools::claim_commission(RuntimeOrigin::signed(10), 1),
+			PoolsError::<Runtime>::NotMigrated
+		);
+		assert_noop!(
+			Pools::adjust_pool_deposit(RuntimeOrigin::signed(10), 1),
+			PoolsError::<Runtime>::NotMigrated
+		);
+		assert_noop!(
+			Pools::set_commission_claim_permission(RuntimeOrigin::signed(10), 1, None),
+			PoolsError::<Runtime>::NotMigrated
+		);
+
+		// migrate the pool.
+		assert_ok!(Pools::migrate_pool_to_delegate_stake(RuntimeOrigin::signed(10), 1));
+		assert_eq!(
+			delegated_staking_events_since_last_call(),
+			vec![DelegatedStakingEvent::Delegated {
+				agent: POOL1_BONDED,
+				delegator: DelegatedStaking::generate_proxy_delegator(Agent::from(POOL1_BONDED))
+					.get(),
+				amount: 50 + 10
+			},]
+		);
+
+		// member is pending migration.
+		assert!(Pools::api_member_needs_delegate_migration(20));
+
+		// ensure member mutation is not allowed until member's delegation is migrated.
+		assert_noop!(
+			Pools::bond_extra(RuntimeOrigin::signed(20), BondExtra::FreeBalance(5)),
+			PoolsError::<Runtime>::NotMigrated
+		);
+		assert_noop!(
+			Pools::bond_extra_other(RuntimeOrigin::signed(10), 20, BondExtra::Rewards),
+			PoolsError::<Runtime>::NotMigrated
+		);
+		assert_noop!(
+			Pools::claim_payout(RuntimeOrigin::signed(20)),
+			PoolsError::<Runtime>::NotMigrated
+		);
+		assert_noop!(
+			Pools::unbond(RuntimeOrigin::signed(20), 20, 5),
+			PoolsError::<Runtime>::NotMigrated
+		);
+		assert_noop!(
+			Pools::withdraw_unbonded(RuntimeOrigin::signed(20), 20, 0),
+			PoolsError::<Runtime>::NotMigrated
+		);
+
+		// migrate 20
+		assert_ok!(Pools::migrate_delegation(RuntimeOrigin::signed(10), 20));
+		// now `bond_extra` for 20 works.
+		assert_ok!(Pools::bond_extra(RuntimeOrigin::signed(20), BondExtra::FreeBalance(5)));
+
+		assert_eq!(
+			staking_events_since_last_call(),
+			vec![StakingEvent::Bonded { stash: POOL1_BONDED, amount: 5 },]
+		);
+
+		assert_eq!(
+			pool_events_since_last_call(),
+			vec![PoolsEvent::Bonded { member: 20, pool_id: 1, bonded: 5, joined: false },]
+		);
+
+		assert_eq!(
+			delegated_staking_events_since_last_call(),
+			vec![
+				DelegatedStakingEvent::MigratedDelegation {
+					agent: POOL1_BONDED,
+					delegator: 20,
+					amount: 10
+				},
+				DelegatedStakingEvent::Delegated { agent: POOL1_BONDED, delegator: 20, amount: 5 },
+			]
+		);
+	})
+}
+
 #[test]
 fn pool_no_dangling_delegation() {
 	new_test_ext().execute_with(|| {
@@ -1214,6 +1394,7 @@ fn pool_no_dangling_delegation() {
 			delegated_staking_events_since_last_call(),
 			vec![DelegatedStakingEvent::Delegated {
 				agent: POOL1_BONDED,
+
 				delegator: alice,
 				amount: 40
 			},]
diff --git a/substrate/frame/support/src/traits/misc.rs b/substrate/frame/support/src/traits/misc.rs
index 7c8c22d1ae5a..492475d6f63c 100644
--- a/substrate/frame/support/src/traits/misc.rs
+++ b/substrate/frame/support/src/traits/misc.rs
@@ -48,6 +48,10 @@ impl VariantCount for () {
 	const VARIANT_COUNT: u32 = 0;
 }
 
+impl VariantCount for u8 {
+	const VARIANT_COUNT: u32 = 256;
+}
+
 /// Adapter for `Get<u32>` to access `VARIANT_COUNT` from `trait pub trait VariantCount {`.
 pub struct VariantCountOf<T: VariantCount>(core::marker::PhantomData<T>);
 impl<T: VariantCount> Get<u32> for VariantCountOf<T> {
diff --git a/substrate/frame/try-runtime/Cargo.toml b/substrate/frame/try-runtime/Cargo.toml
index 2bd791f52385..7f7d1f2b50e0 100644
--- a/substrate/frame/try-runtime/Cargo.toml
+++ b/substrate/frame/try-runtime/Cargo.toml
@@ -6,7 +6,7 @@ edition.workspace = true
 license = "Apache-2.0"
 homepage.workspace = true
 repository.workspace = true
-description = "FRAME pallet for democracy"
+description = "Supporting types for try-runtime, testing and dry-running commands."
 
 [lints]
 workspace = true
diff --git a/substrate/frame/whitelist/Cargo.toml b/substrate/frame/whitelist/Cargo.toml
index e910fc323714..a347174ed2eb 100644
--- a/substrate/frame/whitelist/Cargo.toml
+++ b/substrate/frame/whitelist/Cargo.toml
@@ -6,7 +6,7 @@ edition.workspace = true
 license = "Apache-2.0"
 homepage.workspace = true
 repository.workspace = true
-description = "FRAME pallet for whitelisting call, and dispatch from specific origin"
+description = "FRAME pallet for whitelisting calls, and dispatching from a specific origin"
 
 [lints]
 workspace = true
diff --git a/substrate/primitives/consensus/beefy/Cargo.toml b/substrate/primitives/consensus/beefy/Cargo.toml
index f31aa5756ba2..57ddab9a70ce 100644
--- a/substrate/primitives/consensus/beefy/Cargo.toml
+++ b/substrate/primitives/consensus/beefy/Cargo.toml
@@ -26,6 +26,7 @@ sp-io = { workspace = true }
 sp-mmr-primitives = { workspace = true }
 sp-runtime = { workspace = true }
 sp-keystore = { workspace = true }
+sp-weights = { workspace = true }
 strum = { features = ["derive"], workspace = true }
 lazy_static = { optional = true, workspace = true }
 
@@ -48,6 +49,7 @@ std = [
 	"sp-keystore/std",
 	"sp-mmr-primitives/std",
 	"sp-runtime/std",
+	"sp-weights/std",
 	"strum/std",
 ]
 
diff --git a/substrate/primitives/consensus/beefy/src/lib.rs b/substrate/primitives/consensus/beefy/src/lib.rs
index 6ec4a727e276..e977fb0ea25f 100644
--- a/substrate/primitives/consensus/beefy/src/lib.rs
+++ b/substrate/primitives/consensus/beefy/src/lib.rs
@@ -56,6 +56,7 @@ use sp_runtime::{
 	traits::{Hash, Header as HeaderT, Keccak256, NumberFor},
 	OpaqueValue,
 };
+use sp_weights::Weight;
 
 /// Key type for BEEFY module.
 pub const KEY_TYPE: sp_core::crypto::KeyTypeId = sp_application_crypto::key_types::BEEFY;
@@ -460,6 +461,15 @@ pub trait AncestryHelper<Header: HeaderT> {
 	) -> bool;
 }
 
+/// Weight information for the logic in `AncestryHelper`.
+pub trait AncestryHelperWeightInfo<Header: HeaderT>: AncestryHelper<Header> {
+	/// Weight info for the `AncestryHelper::extract_validation_context()` method.
+	fn extract_validation_context() -> Weight;
+
+	/// Weight info for the `AncestryHelper::is_non_canonical()` method.
+	fn is_non_canonical(proof: &<Self as AncestryHelper<Header>>::Proof) -> Weight;
+}
+
 /// 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/merkle-mountain-range/src/utils.rs b/substrate/primitives/merkle-mountain-range/src/utils.rs
index 72674e24a272..2460af4b800f 100644
--- a/substrate/primitives/merkle-mountain-range/src/utils.rs
+++ b/substrate/primitives/merkle-mountain-range/src/utils.rs
@@ -91,7 +91,7 @@ impl NodesUtils {
 		Self::leaf_node_index_to_leaf_index(rightmost_leaf_pos)
 	}
 
-	// Translate a _leaf_ `NodeIndex` to its `LeafIndex`.
+	/// Translate a _leaf_ `NodeIndex` to its `LeafIndex`.
 	fn leaf_node_index_to_leaf_index(pos: NodeIndex) -> LeafIndex {
 		if pos == 0 {
 			return 0
@@ -100,8 +100,13 @@ impl NodesUtils {
 		(pos + peaks.len() as u64) >> 1
 	}
 
-	// Starting from any node position get position of rightmost leaf; this is the leaf
-	// responsible for the addition of node `pos`.
+	/// Translate a `LeafIndex` to its _leaf_ `NodeIndex`.
+	pub fn leaf_index_to_leaf_node_index(leaf_index: NodeIndex) -> LeafIndex {
+		helper::leaf_index_to_pos(leaf_index)
+	}
+
+	/// Starting from any node position get position of rightmost leaf; this is the leaf
+	/// responsible for the addition of node `pos`.
 	fn rightmost_leaf_node_index_from_pos(pos: NodeIndex) -> NodeIndex {
 		pos - (helper::pos_height_in_tree(pos) as u64)
 	}
diff --git a/templates/minimal/Cargo.toml b/templates/minimal/Cargo.toml
deleted file mode 100644
index ba96e139bcf1..000000000000
--- a/templates/minimal/Cargo.toml
+++ /dev/null
@@ -1,22 +0,0 @@
-[package]
-name = "minimal-template"
-description = "A minimal template built with Substrate, part of Polkadot Sdk."
-version = "0.0.0"
-license = "Unlicense"
-authors.workspace = true
-homepage.workspace = true
-repository.workspace = true
-edition.workspace = true
-publish = false
-
-[dependencies]
-minimal-template-node = { workspace = true }
-minimal-template-runtime = { workspace = true }
-pallet-minimal-template = { workspace = true, default-features = true }
-polkadot-sdk-docs = { workspace = true }
-
-frame = { workspace = true, default-features = true }
-
-# How we build docs in rust-docs
-simple-mermaid = "0.1.1"
-docify = { workspace = true }
diff --git a/templates/minimal/src/lib.rs b/templates/minimal/src/lib.rs
deleted file mode 100644
index 68825d190bb2..000000000000
--- a/templates/minimal/src/lib.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-//! # Minimal Template
-//!
-//! This is a minimal template for creating a blockchain using the Polkadot SDK.
-//!
-//! ## Components
-//!
-//! The template consists of the following components:
-//!
-//! ### Node
-//!
-//! A minimal blockchain [`node`](`minimal_template_node`) that is capable of running a
-//! runtime. It uses a simple chain specification, provides an option to choose Manual or
-//! InstantSeal for consensus and exposes a few commands to interact with the node.
-//!
-//! ### Runtime
-//!
-//! A minimal [`runtime`](`minimal_template_runtime`) (or a state transition function) that
-//! is capable of being run on the node. It is built using the [`FRAME`](`frame`) framework
-//! that enables the composition of the core logic via separate modules called "pallets".
-//! FRAME defines a complete DSL for building such pallets and the runtime itself.
-//!
-//! #### Transaction Fees
-//!
-//! The runtime charges a transaction fee for every transaction that is executed. The fee is
-//! calculated based on the weight of the transaction (accouting for the execution time) and
-//! length of the call data. Please refer to
-//! [`benchmarking docs`](`polkadot_sdk_docs::reference_docs::frame_benchmarking_weight`) for
-//! more information on how the weight is calculated.
-//!
-//! This template sets the fee as independent of the weight of the extrinsic and fixed for any
-//! length of the call data for demo purposes.
-//!
-//! ### Pallet
-//!
-//! A minimal [`pallet`](`pallet_minimal_template`) that is built using FRAME. It is a unit of
-//! encapsulated logic that has a clearly defined responsibility and can be linked to other pallets.
-//!
-//! ## Getting Started
-//!
-//! To get started with the template, follow the steps below:
-//!
-//! ### Build the Node
-//!
-//! Build the node using the following command:
-//!
-//! ```bash
-//! cargo build -p minimal-template-node --release
-//! ```
-//!
-//! ### Run the Node
-//!
-//! Run the node using the following command:
-//!
-//! ```bash
-//! ./target/release/minimal-template-node --dev
-//! ```
-//!
-//! ### CLI Options
-//!
-//! The node exposes a few options that can be used to interact with the node. To see the list of
-//! available options, run the following command:
-//!
-//! ```bash
-//! ./target/release/minimal-template-node --help
-//! ```
-//!
-//! #### Consensus Algorithm
-//!
-//! In order to run the node with a specific consensus algorithm, use the `--consensus` flag. For
-//! example, to run the node with ManualSeal consensus with a block time of 5000ms, use the
-//! following command:
-//!
-//! ```bash
-//! ./target/release/minimal-template-node --dev --consensus manual-seal-5000
-//! ```
diff --git a/umbrella/src/lib.rs b/umbrella/src/lib.rs
index 07f1cbad1262..7bdfcd0b03ae 100644
--- a/umbrella/src/lib.rs
+++ b/umbrella/src/lib.rs
@@ -109,7 +109,7 @@ pub use cumulus_client_network;
 #[cfg(feature = "cumulus-client-parachain-inherent")]
 pub use cumulus_client_parachain_inherent;
 
-/// Cumulus-specific networking protocol.
+/// Parachain PoV recovery.
 #[cfg(feature = "cumulus-client-pov-recovery")]
 pub use cumulus_client_pov_recovery;
 
@@ -272,7 +272,7 @@ pub use frame_system_benchmarking;
 #[cfg(feature = "frame-system-rpc-runtime-api")]
 pub use frame_system_rpc_runtime_api;
 
-/// FRAME pallet for democracy.
+/// Supporting types for try-runtime, testing and dry-running commands.
 #[cfg(feature = "frame-try-runtime")]
 pub use frame_try_runtime;
 
@@ -689,7 +689,7 @@ pub use pallet_utility;
 #[cfg(feature = "pallet-vesting")]
 pub use pallet_vesting;
 
-/// FRAME pallet for whitelisting call, and dispatch from specific origin.
+/// FRAME pallet for whitelisting calls, and dispatching from a specific origin.
 #[cfg(feature = "pallet-whitelist")]
 pub use pallet_whitelist;