diff --git a/Cargo.lock b/Cargo.lock
index cd449c18b316..d8d4e5989dbf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -500,7 +500,7 @@ dependencies = [
 [[package]]
 name = "beefy-gadget"
 version = "0.1.0"
-source = "git+/~https://github.com/paritytech/grandpa-bridge-gadget?branch=master#49a698bbfc35170b116d59006a9c9ae558154991"
+source = "git+/~https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.9#f40c0ab7b327e874d5c8d699bfa5d762f1759ee0"
 dependencies = [
  "beefy-primitives",
  "fnv",
@@ -530,7 +530,7 @@ dependencies = [
 [[package]]
 name = "beefy-gadget-rpc"
 version = "0.1.0"
-source = "git+/~https://github.com/paritytech/grandpa-bridge-gadget?branch=master#49a698bbfc35170b116d59006a9c9ae558154991"
+source = "git+/~https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.9#f40c0ab7b327e874d5c8d699bfa5d762f1759ee0"
 dependencies = [
  "beefy-gadget",
  "beefy-primitives",
@@ -551,12 +551,12 @@ dependencies = [
 [[package]]
 name = "beefy-merkle-tree"
 version = "0.1.0"
-source = "git+/~https://github.com/paritytech/grandpa-bridge-gadget?branch=master#49a698bbfc35170b116d59006a9c9ae558154991"
+source = "git+/~https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.9#f40c0ab7b327e874d5c8d699bfa5d762f1759ee0"
 
 [[package]]
 name = "beefy-primitives"
 version = "0.1.0"
-source = "git+/~https://github.com/paritytech/grandpa-bridge-gadget?branch=master#49a698bbfc35170b116d59006a9c9ae558154991"
+source = "git+/~https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.9#f40c0ab7b327e874d5c8d699bfa5d762f1759ee0"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -1997,7 +1997,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -2015,7 +2015,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2034,7 +2034,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "Inflector",
  "chrono",
@@ -2060,7 +2060,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-support"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2073,7 +2073,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2088,7 +2088,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "14.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -2099,7 +2099,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -2125,7 +2125,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "Inflector",
  "frame-support-procedural-tools",
@@ -2137,7 +2137,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate 1.0.0",
@@ -2149,7 +2149,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2159,7 +2159,7 @@ dependencies = [
 [[package]]
 name = "frame-support-test"
 version = "3.0.0"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-metadata",
  "frame-support",
@@ -2180,7 +2180,7 @@ dependencies = [
 [[package]]
 name = "frame-support-test-pallet"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2190,7 +2190,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -2207,7 +2207,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2221,7 +2221,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2230,7 +2230,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -2680,9 +2680,9 @@ dependencies = [
 
 [[package]]
 name = "hex"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
@@ -4704,7 +4704,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b"
 [[package]]
 name = "pallet-authority-discovery"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4719,7 +4719,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4733,7 +4733,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4756,7 +4756,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4770,7 +4770,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy"
 version = "0.1.0"
-source = "git+/~https://github.com/paritytech/grandpa-bridge-gadget?branch=master#49a698bbfc35170b116d59006a9c9ae558154991"
+source = "git+/~https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.9#f40c0ab7b327e874d5c8d699bfa5d762f1759ee0"
 dependencies = [
  "beefy-primitives",
  "frame-support",
@@ -4786,7 +4786,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy-mmr"
 version = "0.1.0"
-source = "git+/~https://github.com/paritytech/grandpa-bridge-gadget?branch=master#49a698bbfc35170b116d59006a9c9ae558154991"
+source = "git+/~https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.9#f40c0ab7b327e874d5c8d699bfa5d762f1759ee0"
 dependencies = [
  "beefy-merkle-tree",
  "beefy-primitives",
@@ -4811,7 +4811,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4889,7 +4889,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4905,7 +4905,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4920,7 +4920,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -4941,7 +4941,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "5.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4958,7 +4958,7 @@ dependencies = [
 [[package]]
 name = "pallet-gilt"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4972,7 +4972,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4994,7 +4994,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -5009,7 +5009,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5028,7 +5028,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5044,7 +5044,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5059,7 +5059,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "ckb-merkle-mountain-range",
  "frame-benchmarking",
@@ -5076,7 +5076,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr-primitives"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5092,7 +5092,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr-rpc"
 version = "3.0.0"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -5110,7 +5110,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5125,7 +5125,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5138,7 +5138,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5154,7 +5154,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5176,7 +5176,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5191,7 +5191,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -5205,7 +5205,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5220,7 +5220,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5240,7 +5240,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5256,7 +5256,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5269,7 +5269,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5293,7 +5293,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -5304,7 +5304,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-fn"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "log",
  "sp-arithmetic",
@@ -5313,7 +5313,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5326,7 +5326,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5344,7 +5344,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5359,7 +5359,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5375,7 +5375,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -5392,7 +5392,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -5403,7 +5403,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5419,7 +5419,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5434,7 +5434,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -7231,6 +7231,7 @@ dependencies = [
  "pallet-transaction-payment",
  "pallet-transaction-payment-rpc-runtime-api",
  "pallet-vesting",
+ "pallet-xcm",
  "parity-scale-codec",
  "polkadot-parachain",
  "polkadot-primitives",
@@ -7259,6 +7260,9 @@ dependencies = [
  "sp-version",
  "substrate-wasm-builder",
  "tiny-keccak",
+ "xcm",
+ "xcm-builder",
+ "xcm-executor",
 ]
 
 [[package]]
@@ -7932,7 +7936,7 @@ dependencies = [
 [[package]]
 name = "remote-externalities"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "env_logger 0.8.4",
  "hex",
@@ -8231,7 +8235,7 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "log",
  "sp-core",
@@ -8242,7 +8246,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8271,7 +8275,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "futures 0.3.16",
  "futures-timer 3.0.2",
@@ -8294,7 +8298,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -8310,7 +8314,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -8326,7 +8330,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -8337,7 +8341,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "chrono",
  "fdlimit",
@@ -8375,7 +8379,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "derive_more",
  "fnv",
@@ -8409,7 +8413,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -8438,7 +8442,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "async-trait",
  "futures 0.3.16",
@@ -8463,7 +8467,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8510,7 +8514,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "derive_more",
  "futures 0.3.16",
@@ -8534,7 +8538,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -8547,7 +8551,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-manual-seal"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "assert_matches",
  "async-trait",
@@ -8583,7 +8587,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "async-trait",
  "futures 0.3.16",
@@ -8612,7 +8616,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "sc-client-api",
  "sp-authorship",
@@ -8623,7 +8627,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "derive_more",
  "lazy_static",
@@ -8652,7 +8656,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "derive_more",
  "parity-scale-codec",
@@ -8669,7 +8673,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8684,7 +8688,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
@@ -8704,7 +8708,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8745,7 +8749,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "derive_more",
  "finality-grandpa",
@@ -8769,7 +8773,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.16",
@@ -8787,7 +8791,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8807,7 +8811,7 @@ dependencies = [
 [[package]]
 name = "sc-light"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "hash-db",
  "lazy_static",
@@ -8826,7 +8830,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "async-std",
  "async-trait",
@@ -8881,7 +8885,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "futures 0.3.16",
  "futures-timer 3.0.2",
@@ -8898,7 +8902,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
@@ -8926,7 +8930,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "futures 0.3.16",
  "libp2p",
@@ -8939,7 +8943,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.9.0"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -8948,7 +8952,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "futures 0.3.16",
  "hash-db",
@@ -8983,7 +8987,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "derive_more",
  "futures 0.3.16",
@@ -9008,7 +9012,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "futures 0.1.29",
  "jsonrpc-core",
@@ -9026,7 +9030,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "async-trait",
  "directories",
@@ -9094,7 +9098,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -9109,7 +9113,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -9131,7 +9135,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "chrono",
  "futures 0.3.16",
@@ -9151,7 +9155,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -9188,7 +9192,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -9199,7 +9203,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "derive_more",
  "futures 0.3.16",
@@ -9228,7 +9232,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "derive_more",
  "futures 0.3.16",
@@ -9695,7 +9699,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "hash-db",
  "log",
@@ -9712,7 +9716,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate 1.0.0",
@@ -9724,7 +9728,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -9736,7 +9740,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -9750,7 +9754,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -9762,7 +9766,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -9774,7 +9778,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -9786,7 +9790,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "futures 0.3.16",
  "log",
@@ -9804,7 +9808,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "async-trait",
  "futures 0.3.16",
@@ -9830,7 +9834,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "async-trait",
  "merlin",
@@ -9852,7 +9856,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "parity-scale-codec",
  "sp-arithmetic",
@@ -9862,7 +9866,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -9874,7 +9878,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -9918,7 +9922,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "kvdb",
  "parking_lot 0.11.1",
@@ -9927,7 +9931,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "3.0.0"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9937,7 +9941,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -9948,7 +9952,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -9965,7 +9969,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -9979,7 +9983,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "futures 0.3.16",
  "hash-db",
@@ -10004,7 +10008,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -10015,7 +10019,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -10032,7 +10036,7 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "ruzstd",
  "zstd",
@@ -10041,7 +10045,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -10054,7 +10058,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections-compact"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -10065,7 +10069,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -10075,7 +10079,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "3.0.0"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "backtrace",
 ]
@@ -10083,7 +10087,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -10094,7 +10098,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -10115,7 +10119,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -10132,7 +10136,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "Inflector",
  "proc-macro-crate 1.0.0",
@@ -10144,7 +10148,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "3.0.0"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "serde",
  "serde_json",
@@ -10153,7 +10157,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -10166,7 +10170,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -10176,7 +10180,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "hash-db",
  "log",
@@ -10199,12 +10203,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 
 [[package]]
 name = "sp-storage"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -10217,7 +10221,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "log",
  "sp-core",
@@ -10230,7 +10234,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "async-trait",
  "futures-timer 3.0.2",
@@ -10247,7 +10251,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "erased-serde",
  "log",
@@ -10265,7 +10269,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -10274,7 +10278,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "async-trait",
  "log",
@@ -10289,7 +10293,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -10303,7 +10307,7 @@ dependencies = [
 [[package]]
 name = "sp-utils"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "futures 0.3.16",
  "futures-core",
@@ -10315,7 +10319,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -10330,7 +10334,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "parity-scale-codec",
  "proc-macro-crate 1.0.0",
@@ -10342,7 +10346,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -10527,7 +10531,7 @@ dependencies = [
 [[package]]
 name = "substrate-browser-utils"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "chrono",
  "console_error_panic_hook",
@@ -10553,7 +10557,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "platforms",
 ]
@@ -10561,7 +10565,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.16",
@@ -10584,7 +10588,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.9.0"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "async-std",
  "derive_more",
@@ -10598,7 +10602,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "async-trait",
  "futures 0.1.29",
@@ -10627,7 +10631,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "4.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "futures 0.3.16",
  "substrate-test-utils-derive",
@@ -10637,7 +10641,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "quote",
@@ -10647,7 +10651,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -10809,7 +10813,7 @@ dependencies = [
 [[package]]
 name = "test-runner"
 version = "0.9.0"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-system",
  "futures 0.3.16",
@@ -10863,18 +10867,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.24"
+version = "1.0.26"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e"
+checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.24"
+version = "1.0.26"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0"
+checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -11449,7 +11453,7 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
 [[package]]
 name = "try-runtime-cli"
 version = "0.10.0-dev"
-source = "git+/~https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78c4d9b01901b2100582a672c2aadb"
+source = "git+/~https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
 dependencies = [
  "frame-try-runtime",
  "log",
@@ -12318,6 +12322,26 @@ dependencies = [
  "xcm",
 ]
 
+[[package]]
+name = "xcm-executor-integration-tests"
+version = "0.9.9"
+dependencies = [
+ "frame-support",
+ "frame-system",
+ "futures 0.3.16",
+ "pallet-xcm",
+ "polkadot-test-client",
+ "polkadot-test-runtime",
+ "polkadot-test-service",
+ "sp-consensus",
+ "sp-keyring",
+ "sp-runtime",
+ "sp-state-machine",
+ "sp-tracing",
+ "xcm",
+ "xcm-executor",
+]
+
 [[package]]
 name = "xcm-simulator"
 version = "0.9.9"
diff --git a/Cargo.toml b/Cargo.toml
index cfd1ef2d759d..02c1d062241a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,6 +39,7 @@ members = [
 	"xcm",
 	"xcm/xcm-builder",
 	"xcm/xcm-executor",
+	"xcm/xcm-executor/integration-tests",
 	"xcm/xcm-simulator",
 	"xcm/xcm-simulator/example",
 	"xcm/pallet-xcm",
diff --git a/bridges/bin/millau/node/Cargo.toml b/bridges/bin/millau/node/Cargo.toml
index 8c6d32402ac2..8313021ba647 100644
--- a/bridges/bin/millau/node/Cargo.toml
+++ b/bridges/bin/millau/node/Cargo.toml
@@ -24,35 +24,35 @@ pallet-bridge-messages = { path = "../../../modules/messages" }
 
 # Substrate Dependencies
 
-frame-benchmarking = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-frame-benchmarking-cli = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-node-inspect = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-transaction-payment-rpc = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-basic-authorship = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-cli = { git = "/~https://github.com/paritytech/substrate", branch = "master", features = ["wasmtime"] }
-sc-client-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus-aura = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-executor = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-finality-grandpa-rpc = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-rpc = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-service = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-telemetry = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-transaction-pool = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus-aura = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-inherents = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-timestamp = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-substrate-frame-rpc-system = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+frame-benchmarking = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+frame-benchmarking-cli = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+node-inspect = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-transaction-payment-rpc = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-basic-authorship = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-cli = { git = "/~https://github.com/paritytech/substrate", features = ["wasmtime"] , branch = "polkadot-v0.9.9" }
+sc-client-api = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-consensus = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-consensus-aura = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-executor = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-finality-grandpa-rpc = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-rpc = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-service = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-telemetry = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-transaction-pool = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-consensus = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-consensus-aura = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-inherents = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-timestamp = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+substrate-frame-rpc-system = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 [build-dependencies]
-substrate-build-script-utils = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-frame-benchmarking-cli = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+substrate-build-script-utils = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+frame-benchmarking-cli = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 [features]
 default = []
diff --git a/bridges/bin/millau/runtime/Cargo.toml b/bridges/bin/millau/runtime/Cargo.toml
index 367c1c3eef70..7ef4ce7da7b8 100644
--- a/bridges/bin/millau/runtime/Cargo.toml
+++ b/bridges/bin/millau/runtime/Cargo.toml
@@ -28,35 +28,35 @@ pallet-shift-session-manager = { path = "../../../modules/shift-session-manager"
 
 # Substrate Dependencies
 
-frame-executive = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-system-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-aura = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-balances = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-randomness-collective-flip = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-session = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-sudo = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-timestamp = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-transaction-payment-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-block-builder = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-consensus-aura = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-inherents = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-offchain = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-session = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-transaction-pool = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-trie = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-version = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-executive = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-system = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-system-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-aura = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-balances = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-grandpa = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-randomness-collective-flip = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-session = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-sudo = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-timestamp = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-transaction-payment-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-block-builder = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-consensus-aura = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-inherents = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-offchain = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-session = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-transaction-pool = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-trie = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-version = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
 [build-dependencies]
-substrate-wasm-builder = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+substrate-wasm-builder = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 [features]
 default = ["std"]
diff --git a/bridges/bin/millau/runtime/src/lib.rs b/bridges/bin/millau/runtime/src/lib.rs
index aa71b866f95d..a64b26c9cc69 100644
--- a/bridges/bin/millau/runtime/src/lib.rs
+++ b/bridges/bin/millau/runtime/src/lib.rs
@@ -157,7 +157,7 @@ parameter_types! {
 
 impl frame_system::Config for Runtime {
 	/// The basic call filter to use in dispatchable.
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	/// The identifier used to distinguish between accounts.
 	type AccountId = AccountId;
 	/// The aggregated dispatch type that is available for extrinsics.
@@ -214,7 +214,7 @@ impl pallet_bridge_dispatch::Config for Runtime {
 	type Event = Event;
 	type MessageId = (bp_messages::LaneId, bp_messages::MessageNonce);
 	type Call = Call;
-	type CallFilter = frame_support::traits::AllowAll;
+	type CallFilter = frame_support::traits::Everything;
 	type EncodedCall = crate::rialto_messages::FromRialtoEncodedCall;
 	type SourceChainAccountId = bp_rialto::AccountId;
 	type TargetChainAccountPublic = MultiSigner;
diff --git a/bridges/bin/rialto/node/Cargo.toml b/bridges/bin/rialto/node/Cargo.toml
index 1c9ec8b5bb0a..325e968970f8 100644
--- a/bridges/bin/rialto/node/Cargo.toml
+++ b/bridges/bin/rialto/node/Cargo.toml
@@ -25,35 +25,35 @@ rialto-runtime = { path = "../runtime" }
 # Substrate Dependencies
 
 
-frame-benchmarking = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-frame-benchmarking-cli = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-node-inspect = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-transaction-payment-rpc = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-basic-authorship = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-cli = { git = "/~https://github.com/paritytech/substrate", branch = "master", features = ["wasmtime"] }
-sc-client-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus-aura = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-executor = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-finality-grandpa-rpc = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-rpc = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-service = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-telemetry = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-transaction-pool = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus-aura = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-inherents = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-timestamp = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-substrate-frame-rpc-system = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+frame-benchmarking = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+frame-benchmarking-cli = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+node-inspect = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-transaction-payment-rpc = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-basic-authorship = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-cli = { git = "/~https://github.com/paritytech/substrate", features = ["wasmtime"] , branch = "polkadot-v0.9.9" }
+sc-client-api = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-consensus = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-consensus-aura = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-executor = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-finality-grandpa-rpc = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-rpc = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-service = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-telemetry = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-transaction-pool = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-consensus = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-consensus-aura = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-inherents = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-timestamp = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+substrate-frame-rpc-system = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 [build-dependencies]
-substrate-build-script-utils = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-frame-benchmarking-cli = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+substrate-build-script-utils = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+frame-benchmarking-cli = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 [features]
 default = []
diff --git a/bridges/bin/rialto/runtime/Cargo.toml b/bridges/bin/rialto/runtime/Cargo.toml
index f66b8920c8a5..d1f71bcca613 100644
--- a/bridges/bin/rialto/runtime/Cargo.toml
+++ b/bridges/bin/rialto/runtime/Cargo.toml
@@ -34,41 +34,41 @@ pallet-shift-session-manager = { path = "../../../modules/shift-session-manager"
 
 # Substrate Dependencies
 
-frame-benchmarking = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false, optional = true }
-frame-executive = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-system-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-aura = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-balances = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-randomness-collective-flip = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-session = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-sudo = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-timestamp = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-transaction-payment-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-block-builder = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-consensus-aura = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-inherents = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-offchain = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-session = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-transaction-pool = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-trie = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-version = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-benchmarking = { git = "/~https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.9" }
+frame-executive = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-system = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-system-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-aura = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-balances = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-grandpa = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-randomness-collective-flip = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-session = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-sudo = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-timestamp = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-transaction-payment-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-block-builder = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-consensus-aura = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-inherents = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-io = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-offchain = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-session = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-transaction-pool = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-trie = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-version = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
 
 [dev-dependencies]
 libsecp256k1 = { version = "0.3.4", features = ["hmac"] }
 
 [build-dependencies]
-substrate-wasm-builder = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+substrate-wasm-builder = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 [features]
 default = ["std"]
diff --git a/bridges/bin/rialto/runtime/src/lib.rs b/bridges/bin/rialto/runtime/src/lib.rs
index 0a2ae64fe033..333a6f38f9f4 100644
--- a/bridges/bin/rialto/runtime/src/lib.rs
+++ b/bridges/bin/rialto/runtime/src/lib.rs
@@ -165,7 +165,7 @@ parameter_types! {
 
 impl frame_system::Config for Runtime {
 	/// The basic call filter to use in dispatchable.
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	/// The identifier used to distinguish between accounts.
 	type AccountId = AccountId;
 	/// The aggregated dispatch type that is available for extrinsics.
@@ -265,7 +265,7 @@ impl pallet_bridge_dispatch::Config for Runtime {
 	type Event = Event;
 	type MessageId = (bp_messages::LaneId, bp_messages::MessageNonce);
 	type Call = Call;
-	type CallFilter = frame_support::traits::AllowAll;
+	type CallFilter = frame_support::traits::Everything;
 	type EncodedCall = crate::millau_messages::FromMillauEncodedCall;
 	type SourceChainAccountId = bp_millau::AccountId;
 	type TargetChainAccountPublic = MultiSigner;
diff --git a/bridges/bin/runtime-common/Cargo.toml b/bridges/bin/runtime-common/Cargo.toml
index 07fe8910c21f..d77172881e7b 100644
--- a/bridges/bin/runtime-common/Cargo.toml
+++ b/bridges/bin/runtime-common/Cargo.toml
@@ -23,13 +23,13 @@ pallet-bridge-messages = { path = "../../modules/messages", default-features = f
 
 # Substrate dependencies
 
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-state-machine = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false, optional = true }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-trie = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-state-machine = { git = "/~https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-trie = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
 [features]
 default = ["std"]
diff --git a/bridges/fuzz/storage-proof/Cargo.toml b/bridges/fuzz/storage-proof/Cargo.toml
index c5848ebed00e..f8ae7633d996 100644
--- a/bridges/fuzz/storage-proof/Cargo.toml
+++ b/bridges/fuzz/storage-proof/Cargo.toml
@@ -23,12 +23,12 @@ bp-test-utils = { path = "../../primitives/test-utils" }
 
 # Substrate Dependencies
 
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-state-machine = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-trie = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-state-machine = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-trie = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
diff --git a/bridges/modules/currency-exchange/Cargo.toml b/bridges/modules/currency-exchange/Cargo.toml
index 8094f0f2b6ee..b582e41e3789 100644
--- a/bridges/modules/currency-exchange/Cargo.toml
+++ b/bridges/modules/currency-exchange/Cargo.toml
@@ -18,15 +18,15 @@ bp-header-chain = { path = "../../primitives/header-chain", default-features = f
 
 # Substrate Dependencies
 
-frame-benchmarking = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false, optional = true }
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false, optional = true }
+frame-benchmarking = { git = "/~https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.9" }
+frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-system = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.9" }
 
 [dev-dependencies]
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 [features]
 default = ["std"]
diff --git a/bridges/modules/currency-exchange/src/lib.rs b/bridges/modules/currency-exchange/src/lib.rs
index fdf045ca5669..79dd659283df 100644
--- a/bridges/modules/currency-exchange/src/lib.rs
+++ b/bridges/modules/currency-exchange/src/lib.rs
@@ -355,7 +355,7 @@ mod tests {
 		type AccountData = ();
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
-		type BaseCallFilter = frame_support::traits::AllowAll;
+		type BaseCallFilter = frame_support::traits::Everything;
 		type SystemWeightInfo = ();
 		type BlockWeights = ();
 		type BlockLength = ();
diff --git a/bridges/modules/dispatch/Cargo.toml b/bridges/modules/dispatch/Cargo.toml
index 6170af272ad9..65d89781b6a6 100644
--- a/bridges/modules/dispatch/Cargo.toml
+++ b/bridges/modules/dispatch/Cargo.toml
@@ -17,14 +17,14 @@ bp-runtime = { path = "../../primitives/runtime", default-features = false }
 
 # Substrate Dependencies
 
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-system = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
 [dev-dependencies]
-sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 serde = "1.0"
 
 [features]
diff --git a/bridges/modules/dispatch/src/lib.rs b/bridges/modules/dispatch/src/lib.rs
index a540021f6df4..8d089f330506 100644
--- a/bridges/modules/dispatch/src/lib.rs
+++ b/bridges/modules/dispatch/src/lib.rs
@@ -37,7 +37,7 @@ use frame_support::{
 	decl_event, decl_module, decl_storage,
 	dispatch::{Dispatchable, Parameter},
 	ensure,
-	traits::{Filter, Get},
+	traits::{Contains, Get},
 	weights::{extract_actual_weight, GetDispatchInfo},
 };
 use frame_system::RawOrigin;
@@ -73,7 +73,7 @@ pub trait Config<I = DefaultInstance>: frame_system::Config {
 	///
 	/// The pallet will filter all incoming calls right before they're dispatched. If this filter
 	/// rejects the call, special event (`Event::MessageCallRejected`) is emitted.
-	type CallFilter: Filter<<Self as Config<I>>::Call>;
+	type CallFilter: Contains<<Self as Config<I>>::Call>;
 	/// The type that is used to wrap the `Self::Call` when it is moved over bridge.
 	///
 	/// The idea behind this is to avoid `Call` conversion/decoding until we'll be sure
@@ -244,7 +244,7 @@ impl<T: Config<I>, I: Instance> MessageDispatch<T::AccountId, T::MessageId> for
 		};
 
 		// filter the call
-		if !T::CallFilter::filter(&call) {
+		if !T::CallFilter::contains(&call) {
 			log::trace!(
 				target: "runtime::bridge-dispatch",
 				"Message {:?}/{:?}: the call ({:?}) is rejected by filter",
@@ -482,7 +482,7 @@ mod tests {
 		type AccountData = ();
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
-		type BaseCallFilter = frame_support::traits::AllowAll;
+		type BaseCallFilter = frame_support::traits::Everything;
 		type SystemWeightInfo = ();
 		type BlockWeights = ();
 		type BlockLength = ();
@@ -514,8 +514,8 @@ mod tests {
 
 	pub struct TestCallFilter;
 
-	impl Filter<Call> for TestCallFilter {
-		fn filter(call: &Call) -> bool {
+	impl Contains<Call> for TestCallFilter {
+		fn contains(call: &Call) -> bool {
 			!matches!(*call, Call::System(frame_system::Call::fill_block(_)))
 		}
 	}
diff --git a/bridges/modules/ethereum-contract-builtin/Cargo.toml b/bridges/modules/ethereum-contract-builtin/Cargo.toml
index d20b0d0be85b..1706e3c1f21c 100644
--- a/bridges/modules/ethereum-contract-builtin/Cargo.toml
+++ b/bridges/modules/ethereum-contract-builtin/Cargo.toml
@@ -19,10 +19,10 @@ rialto-runtime = { path = "../../bin/rialto/runtime" }
 
 # Substrate Dependencies
 
-sc-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-blockchain = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sc-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-blockchain = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 [dev-dependencies]
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
diff --git a/bridges/modules/ethereum/Cargo.toml b/bridges/modules/ethereum/Cargo.toml
index fdd93ed73311..4788516db2a4 100644
--- a/bridges/modules/ethereum/Cargo.toml
+++ b/bridges/modules/ethereum/Cargo.toml
@@ -18,12 +18,12 @@ bp-eth-poa = { path = "../../primitives/ethereum-poa", default-features = false
 
 # Substrate Dependencies
 
-frame-benchmarking = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false, optional = true }
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-benchmarking = { git = "/~https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.9" }
+frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-system = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-io = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
 [dev-dependencies]
 libsecp256k1 = { version = "0.3.4", features = ["hmac"] }
diff --git a/bridges/modules/ethereum/src/mock.rs b/bridges/modules/ethereum/src/mock.rs
index 68e3e223d1d9..c8102cdb0b05 100644
--- a/bridges/modules/ethereum/src/mock.rs
+++ b/bridges/modules/ethereum/src/mock.rs
@@ -73,7 +73,7 @@ impl frame_system::Config for TestRuntime {
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type SystemWeightInfo = ();
 	type BlockWeights = ();
 	type BlockLength = ();
diff --git a/bridges/modules/grandpa/Cargo.toml b/bridges/modules/grandpa/Cargo.toml
index aa2e33cf447b..8eda23f6d063 100644
--- a/bridges/modules/grandpa/Cargo.toml
+++ b/bridges/modules/grandpa/Cargo.toml
@@ -21,19 +21,19 @@ bp-header-chain = { path = "../../primitives/header-chain", default-features = f
 
 # Substrate Dependencies
 
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-trie = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-system = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-trie = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
 # Optional Benchmarking Dependencies
 bp-test-utils = { path = "../../primitives/test-utils", default-features = false, optional = true }
-frame-benchmarking = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false, optional = true }
+frame-benchmarking = { git = "/~https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.9" }
 
 [dev-dependencies]
-sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 [features]
 default = ["std"]
diff --git a/bridges/modules/grandpa/src/mock.rs b/bridges/modules/grandpa/src/mock.rs
index 24113a8253a3..fc9970c8cfd1 100644
--- a/bridges/modules/grandpa/src/mock.rs
+++ b/bridges/modules/grandpa/src/mock.rs
@@ -70,7 +70,7 @@ impl frame_system::Config for TestRuntime {
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type SystemWeightInfo = ();
 	type DbWeight = ();
 	type BlockWeights = ();
diff --git a/bridges/modules/messages/Cargo.toml b/bridges/modules/messages/Cargo.toml
index a26cf65c028b..6ee80d4d790e 100644
--- a/bridges/modules/messages/Cargo.toml
+++ b/bridges/modules/messages/Cargo.toml
@@ -22,18 +22,18 @@ bp-runtime = { path = "../../primitives/runtime", default-features = false }
 
 # Substrate Dependencies
 
-frame-benchmarking = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false, optional = true }
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-benchmarking = { git = "/~https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.9" }
+frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-system = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
 [dev-dependencies]
 hex = "0.4"
 hex-literal = "0.3"
-sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-balances = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-balances = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 [features]
 default = ["std"]
diff --git a/bridges/modules/messages/src/mock.rs b/bridges/modules/messages/src/mock.rs
index e6f46c292d7a..4fc8d3ed6b17 100644
--- a/bridges/modules/messages/src/mock.rs
+++ b/bridges/modules/messages/src/mock.rs
@@ -106,7 +106,7 @@ impl frame_system::Config for TestRuntime {
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type SystemWeightInfo = ();
 	type BlockWeights = ();
 	type BlockLength = ();
diff --git a/bridges/modules/shift-session-manager/Cargo.toml b/bridges/modules/shift-session-manager/Cargo.toml
index 6dac97ddde60..e529477aa953 100644
--- a/bridges/modules/shift-session-manager/Cargo.toml
+++ b/bridges/modules/shift-session-manager/Cargo.toml
@@ -11,15 +11,15 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
 
 # Substrate Dependencies
 
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-session = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-staking = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-system = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-session = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-staking = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
 [dev-dependencies]
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 serde = "1.0"
 
 [features]
diff --git a/bridges/modules/shift-session-manager/src/lib.rs b/bridges/modules/shift-session-manager/src/lib.rs
index cfed6b31cc70..7cf05e99f3a0 100644
--- a/bridges/modules/shift-session-manager/src/lib.rs
+++ b/bridges/modules/shift-session-manager/src/lib.rs
@@ -139,7 +139,7 @@ mod tests {
 		type AccountData = ();
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
-		type BaseCallFilter = frame_support::traits::AllowAll;
+		type BaseCallFilter = frame_support::traits::Everything;
 		type SystemWeightInfo = ();
 		type BlockWeights = ();
 		type BlockLength = ();
diff --git a/bridges/primitives/chain-kusama/Cargo.toml b/bridges/primitives/chain-kusama/Cargo.toml
index 70ff3b844df0..7410220c2e89 100644
--- a/bridges/primitives/chain-kusama/Cargo.toml
+++ b/bridges/primitives/chain-kusama/Cargo.toml
@@ -14,8 +14,8 @@ bp-polkadot-core = { path = "../polkadot-core", default-features = false }
 bp-runtime = { path = "../runtime", default-features = false }
 
 # Substrate Based Dependencies
-sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/chain-millau/Cargo.toml b/bridges/primitives/chain-millau/Cargo.toml
index 671bcbd53d00..28327d478b19 100644
--- a/bridges/primitives/chain-millau/Cargo.toml
+++ b/bridges/primitives/chain-millau/Cargo.toml
@@ -21,14 +21,14 @@ serde = { version = "1.0.101", optional = true, features = ["derive"] }
 
 # Substrate Based Dependencies
 
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-trie = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-system = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-io = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-trie = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/chain-polkadot/Cargo.toml b/bridges/primitives/chain-polkadot/Cargo.toml
index 22ded41b9145..4be0f1e5564f 100644
--- a/bridges/primitives/chain-polkadot/Cargo.toml
+++ b/bridges/primitives/chain-polkadot/Cargo.toml
@@ -15,8 +15,8 @@ bp-runtime = { path = "../runtime", default-features = false }
 
 # Substrate Based Dependencies
 
-sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/chain-rialto/Cargo.toml b/bridges/primitives/chain-rialto/Cargo.toml
index 7e039a40acd9..fd46f0ec957f 100644
--- a/bridges/primitives/chain-rialto/Cargo.toml
+++ b/bridges/primitives/chain-rialto/Cargo.toml
@@ -15,12 +15,12 @@ bp-runtime = { path = "../runtime", default-features = false }
 
 # Substrate Based Dependencies
 
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-system = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/chain-rococo/Cargo.toml b/bridges/primitives/chain-rococo/Cargo.toml
index 33772c7890a0..45980a3d092e 100644
--- a/bridges/primitives/chain-rococo/Cargo.toml
+++ b/bridges/primitives/chain-rococo/Cargo.toml
@@ -16,11 +16,11 @@ bp-polkadot-core = { path = "../polkadot-core", default-features = false }
 bp-runtime = { path = "../runtime", default-features = false }
 
 # Substrate Based Dependencies
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-version = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-version = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/chain-westend/Cargo.toml b/bridges/primitives/chain-westend/Cargo.toml
index d5fda1ccef05..437667d1b293 100644
--- a/bridges/primitives/chain-westend/Cargo.toml
+++ b/bridges/primitives/chain-westend/Cargo.toml
@@ -16,10 +16,10 @@ bp-polkadot-core = { path = "../polkadot-core", default-features = false }
 bp-runtime = { path = "../runtime", default-features = false }
 
 # Substrate Based Dependencies
-sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-version = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-version = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/chain-wococo/Cargo.toml b/bridges/primitives/chain-wococo/Cargo.toml
index 88201dde9ac1..24f8de8f4143 100644
--- a/bridges/primitives/chain-wococo/Cargo.toml
+++ b/bridges/primitives/chain-wococo/Cargo.toml
@@ -16,9 +16,9 @@ bp-rococo = { path = "../chain-rococo", default-features = false }
 bp-runtime = { path = "../runtime", default-features = false }
 
 # Substrate Based Dependencies
-sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/currency-exchange/Cargo.toml b/bridges/primitives/currency-exchange/Cargo.toml
index 43367ba7992b..5b93048ae6f6 100644
--- a/bridges/primitives/currency-exchange/Cargo.toml
+++ b/bridges/primitives/currency-exchange/Cargo.toml
@@ -11,9 +11,9 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
 
 # Substrate Dependencies
 
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/ethereum-poa/Cargo.toml b/bridges/primitives/ethereum-poa/Cargo.toml
index cd2c3a97a0f3..7add210452ee 100644
--- a/bridges/primitives/ethereum-poa/Cargo.toml
+++ b/bridges/primitives/ethereum-poa/Cargo.toml
@@ -24,10 +24,10 @@ triehash = { version = "0.8.2", default-features = false }
 
 # Substrate Dependencies
 
-sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+sp-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-io = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
 [dev-dependencies]
 hex-literal = "0.2"
diff --git a/bridges/primitives/header-chain/Cargo.toml b/bridges/primitives/header-chain/Cargo.toml
index 844e59865202..6f51bc65627f 100644
--- a/bridges/primitives/header-chain/Cargo.toml
+++ b/bridges/primitives/header-chain/Cargo.toml
@@ -13,11 +13,11 @@ serde = { version = "1.0", optional = true }
 
 # Substrate Dependencies
 
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
 [dev-dependencies]
 assert_matches = "1.5"
diff --git a/bridges/primitives/message-dispatch/Cargo.toml b/bridges/primitives/message-dispatch/Cargo.toml
index 84fa48553a21..36f02b9fc4ff 100644
--- a/bridges/primitives/message-dispatch/Cargo.toml
+++ b/bridges/primitives/message-dispatch/Cargo.toml
@@ -12,8 +12,8 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
 
 # Substrate Dependencies
 
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/messages/Cargo.toml b/bridges/primitives/messages/Cargo.toml
index b5b68220a409..93547bed7518 100644
--- a/bridges/primitives/messages/Cargo.toml
+++ b/bridges/primitives/messages/Cargo.toml
@@ -18,9 +18,9 @@ bp-runtime = { path = "../runtime", default-features = false }
 
 # Substrate Dependencies
 
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-system = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/polkadot-core/Cargo.toml b/bridges/primitives/polkadot-core/Cargo.toml
index 995f948e5d47..f94ef9ed1eb3 100644
--- a/bridges/primitives/polkadot-core/Cargo.toml
+++ b/bridges/primitives/polkadot-core/Cargo.toml
@@ -16,13 +16,13 @@ bp-runtime = { path = "../runtime", default-features = false }
 
 # Substrate Based Dependencies
 
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-version = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-system = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-version = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
 [dev-dependencies]
 hex = "0.4"
diff --git a/bridges/primitives/runtime/Cargo.toml b/bridges/primitives/runtime/Cargo.toml
index 17fa96b2c908..dd84ffa70a55 100644
--- a/bridges/primitives/runtime/Cargo.toml
+++ b/bridges/primitives/runtime/Cargo.toml
@@ -13,16 +13,16 @@ num-traits = { version = "0.2", default-features = false }
 
 # Substrate Dependencies
 
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-state-machine = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-trie = { git = "/~https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-io = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-state-machine = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-trie = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
 [dev-dependencies]
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 
 [features]
diff --git a/bridges/primitives/test-utils/Cargo.toml b/bridges/primitives/test-utils/Cargo.toml
index fe6a68087873..723655eac1d8 100644
--- a/bridges/primitives/test-utils/Cargo.toml
+++ b/bridges/primitives/test-utils/Cargo.toml
@@ -10,10 +10,10 @@ bp-header-chain = { path = "../header-chain", default-features = false  }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 ed25519-dalek = { version = "1.0", default-features = false, features = ["u64_backend"] }
 finality-grandpa = { version = "0.14.1", default-features = false }
-sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false  }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", default-features = false  , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
 [features]
 default = ["std"]
diff --git a/bridges/relays/bin-ethereum/Cargo.toml b/bridges/relays/bin-ethereum/Cargo.toml
index efd9c0194b28..d1fbde3082aa 100644
--- a/bridges/relays/bin-ethereum/Cargo.toml
+++ b/bridges/relays/bin-ethereum/Cargo.toml
@@ -40,9 +40,9 @@ rialto-runtime = { path = "../../bin/rialto/runtime" }
 
 # Substrate Dependencies
 
-frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-substrate-prometheus-endpoint = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+substrate-prometheus-endpoint = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
diff --git a/bridges/relays/bin-substrate/Cargo.toml b/bridges/relays/bin-substrate/Cargo.toml
index c2f30546f30f..18ea6b734af9 100644
--- a/bridges/relays/bin-substrate/Cargo.toml
+++ b/bridges/relays/bin-substrate/Cargo.toml
@@ -51,14 +51,14 @@ rialto-runtime = { path = "../../bin/rialto/runtime" }
 
 # Substrate Dependencies
 
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-trie = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-version = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-trie = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-version = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 [dev-dependencies]
 hex-literal = "0.3"
 pallet-bridge-grandpa = { path = "../../modules/grandpa" }
-sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
diff --git a/bridges/relays/client-kusama/Cargo.toml b/bridges/relays/client-kusama/Cargo.toml
index b9c397bca6c0..ab34eb254be8 100644
--- a/bridges/relays/client-kusama/Cargo.toml
+++ b/bridges/relays/client-kusama/Cargo.toml
@@ -17,9 +17,9 @@ bp-kusama = { path = "../../primitives/chain-kusama" }
 
 # Substrate Dependencies
 
-frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
diff --git a/bridges/relays/client-millau/Cargo.toml b/bridges/relays/client-millau/Cargo.toml
index e16f06f8528b..7e223b83f315 100644
--- a/bridges/relays/client-millau/Cargo.toml
+++ b/bridges/relays/client-millau/Cargo.toml
@@ -17,9 +17,9 @@ millau-runtime = { path = "../../bin/millau/runtime" }
 
 # Substrate Dependencies
 
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
diff --git a/bridges/relays/client-polkadot/Cargo.toml b/bridges/relays/client-polkadot/Cargo.toml
index b148745f5a98..1146e265112c 100644
--- a/bridges/relays/client-polkadot/Cargo.toml
+++ b/bridges/relays/client-polkadot/Cargo.toml
@@ -17,9 +17,9 @@ bp-polkadot = { path = "../../primitives/chain-polkadot" }
 
 # Substrate Dependencies
 
-frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
diff --git a/bridges/relays/client-rialto/Cargo.toml b/bridges/relays/client-rialto/Cargo.toml
index 88e8e12add40..f5947b3f3b3b 100644
--- a/bridges/relays/client-rialto/Cargo.toml
+++ b/bridges/relays/client-rialto/Cargo.toml
@@ -17,9 +17,9 @@ rialto-runtime = { path = "../../bin/rialto/runtime" }
 
 # Substrate Dependencies
 
-frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
diff --git a/bridges/relays/client-rococo/Cargo.toml b/bridges/relays/client-rococo/Cargo.toml
index 5611ac27b1ce..5f1034478277 100644
--- a/bridges/relays/client-rococo/Cargo.toml
+++ b/bridges/relays/client-rococo/Cargo.toml
@@ -24,9 +24,9 @@ pallet-bridge-dispatch = { path = "../../modules/dispatch" }
 pallet-bridge-messages = { path = "../../modules/messages" }
 
 # Substrate Dependencies
-frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
diff --git a/bridges/relays/client-substrate/Cargo.toml b/bridges/relays/client-substrate/Cargo.toml
index f5c2e2656059..99abf3b63ad2 100644
--- a/bridges/relays/client-substrate/Cargo.toml
+++ b/bridges/relays/client-substrate/Cargo.toml
@@ -26,17 +26,17 @@ relay-utils = { path = "../utils" }
 
 # Substrate Dependencies
 
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-balances = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-rpc-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-storage = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-trie = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-version = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-balances = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-rpc-api = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-storage = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-trie = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-version = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 #[dev-dependencies]
 futures = "0.3.7"
diff --git a/bridges/relays/client-westend/Cargo.toml b/bridges/relays/client-westend/Cargo.toml
index a408ae3a46da..6e757844e108 100644
--- a/bridges/relays/client-westend/Cargo.toml
+++ b/bridges/relays/client-westend/Cargo.toml
@@ -17,9 +17,9 @@ bp-westend = { path = "../../primitives/chain-westend" }
 
 # Substrate Dependencies
 
-frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
diff --git a/bridges/relays/client-wococo/Cargo.toml b/bridges/relays/client-wococo/Cargo.toml
index c1b9aafd95e7..9b6ce18d9f4f 100644
--- a/bridges/relays/client-wococo/Cargo.toml
+++ b/bridges/relays/client-wococo/Cargo.toml
@@ -24,9 +24,9 @@ pallet-bridge-dispatch = { path = "../../modules/dispatch" }
 pallet-bridge-messages = { path = "../../modules/messages" }
 
 # Substrate Dependencies
-frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
diff --git a/bridges/relays/utils/Cargo.toml b/bridges/relays/utils/Cargo.toml
index ff80cab53381..7320139e3f5c 100644
--- a/bridges/relays/utils/Cargo.toml
+++ b/bridges/relays/utils/Cargo.toml
@@ -22,4 +22,4 @@ time = "0.2"
 
 # Substrate dependencies
 
-substrate-prometheus-endpoint = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+substrate-prometheus-endpoint = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 5b0eff497426..455214fe1a9d 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -24,19 +24,19 @@ futures = "0.3.15"
 service = { package = "polkadot-service", path = "../node/service", default-features = false, optional = true }
 polkadot-node-core-pvf = { path = "../node/core/pvf", optional = true }
 
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-frame-benchmarking-cli = { git = "/~https://github.com/paritytech/substrate", branch = "master", optional = true }
-try-runtime-cli = { git = "/~https://github.com/paritytech/substrate", branch = "master", optional = true }
-sc-cli = { git = "/~https://github.com/paritytech/substrate", branch = "master", optional = true }
-sc-service = { git = "/~https://github.com/paritytech/substrate", branch = "master", optional = true }
-browser-utils = { package = "substrate-browser-utils", git = "/~https://github.com/paritytech/substrate", branch = "master", optional = true }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+frame-benchmarking-cli = { git = "/~https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.9" }
+try-runtime-cli = { git = "/~https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.9" }
+sc-cli = { git = "/~https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.9" }
+sc-service = { git = "/~https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.9" }
+browser-utils = { package = "substrate-browser-utils", git = "/~https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.9" }
 
 # this crate is used only to enable `trie-memory-tracker` feature
 # see /~https://github.com/paritytech/substrate/pull/6745
-sp-trie = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-trie = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
 [build-dependencies]
-substrate-build-script-utils = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+substrate-build-script-utils = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 [features]
 default = [ "wasmtime", "db", "cli", "full-node", "trie-memory-tracker" ]
diff --git a/core-primitives/Cargo.toml b/core-primitives/Cargo.toml
index e40196ec559f..1632a487f2c3 100644
--- a/core-primitives/Cargo.toml
+++ b/core-primitives/Cargo.toml
@@ -5,9 +5,9 @@ authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
 [dependencies]
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-core = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 parity-scale-codec = { version = "2.0.0", default-features = false, features = [ "derive" ] }
 parity-util-mem = { version = "0.10.0", default-features = false, optional = true }
 
diff --git a/erasure-coding/Cargo.toml b/erasure-coding/Cargo.toml
index 552d41271d55..a00b58ceb3cd 100644
--- a/erasure-coding/Cargo.toml
+++ b/erasure-coding/Cargo.toml
@@ -9,6 +9,6 @@ polkadot-primitives = { path = "../primitives" }
 polkadot-node-primitives = { package = "polkadot-node-primitives", path = "../node/primitives" }
 novelpoly = { package = "reed-solomon-novelpoly", version = "1.0.0" }
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["std", "derive"] }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-trie = { package = "sp-trie", git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+trie = { package = "sp-trie", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 thiserror = "1.0.23"
diff --git a/node/client/Cargo.toml b/node/client/Cargo.toml
index 5938060dd7f5..4334d612b0d6 100644
--- a/node/client/Cargo.toml
+++ b/node/client/Cargo.toml
@@ -5,31 +5,31 @@ authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
 [dependencies]
-frame-benchmarking = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-transaction-payment-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-frame-system-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-
-sp-consensus = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-storage = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-blockchain = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-session = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-authority-discovery = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus-babe = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-transaction-pool = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-offchain = { package = "sp-offchain", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-block-builder = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-
-sc-consensus = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-executor = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-client-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-service = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-
-pallet-mmr-primitives = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-
-beefy-primitives = { git = "/~https://github.com/paritytech/grandpa-bridge-gadget", branch = "master" }
+frame-benchmarking = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-transaction-payment-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+frame-system-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+
+sp-consensus = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-storage = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-blockchain = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-session = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-authority-discovery = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-consensus-babe = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-transaction-pool = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-offchain = { package = "sp-offchain", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-block-builder = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+
+sc-consensus = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-executor = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-client-api = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-service = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+
+pallet-mmr-primitives = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+
+beefy-primitives = { git = "/~https://github.com/paritytech/grandpa-bridge-gadget", branch = "polkadot-v0.9.9" }
 
 # Polkadot Runtimes
 polkadot-runtime = { path = "../../runtime/polkadot" }
diff --git a/node/collation-generation/Cargo.toml b/node/collation-generation/Cargo.toml
index daf823238a2f..e9a9e9795818 100644
--- a/node/collation-generation/Cargo.toml
+++ b/node/collation-generation/Cargo.toml
@@ -12,8 +12,8 @@ polkadot-node-primitives = { path = "../primitives" }
 polkadot-node-subsystem = { path = "../subsystem" }
 polkadot-node-subsystem-util = { path = "../subsystem-util" }
 polkadot-primitives = { path = "../../primitives" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-maybe-compressed-blob  = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-maybe-compressed-blob  = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 thiserror = "1.0.23"
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["bit-vec", "derive"] }
 
diff --git a/node/core/approval-voting/Cargo.toml b/node/core/approval-voting/Cargo.toml
index 55cd0cd2c98a..2dfca1f6d7c5 100644
--- a/node/core/approval-voting/Cargo.toml
+++ b/node/core/approval-voting/Cargo.toml
@@ -23,21 +23,21 @@ polkadot-primitives = { path = "../../../primitives" }
 polkadot-node-primitives = { path = "../../primitives" }
 polkadot-node-jaeger = { path = "../../jaeger" }
 
-sc-client-api = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sc-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-consensus = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-consensus-slots = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-blockchain = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false, features = ["full_crypto"] }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sc-client-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sc-keystore = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-consensus = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-consensus-slots = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-blockchain = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", default-features = false, features = ["full_crypto"] , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
 [dev-dependencies]
 parking_lot = "0.11.1"
 rand_core = "0.5.1" # should match schnorrkel
-sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus-babe = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-consensus-babe = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 maplit = "1.0.2"
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
 assert_matches = "1.4.0"
diff --git a/node/core/av-store/Cargo.toml b/node/core/av-store/Cargo.toml
index 4bb1f63fe397..54e6c75b53bd 100644
--- a/node/core/av-store/Cargo.toml
+++ b/node/core/av-store/Cargo.toml
@@ -26,8 +26,8 @@ env_logger = "0.8.4"
 assert_matches = "1.4.0"
 kvdb-memorydb = "0.10.0"
 
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
-sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 parking_lot = "0.11.1"
diff --git a/node/core/backing/Cargo.toml b/node/core/backing/Cargo.toml
index ac58afa5d4fb..968439560a56 100644
--- a/node/core/backing/Cargo.toml
+++ b/node/core/backing/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 futures = "0.3.15"
-sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 polkadot-primitives = { path = "../../../primitives" }
 polkadot-node-primitives = { path = "../../primitives" }
 polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
@@ -18,11 +18,11 @@ tracing = "0.1.26"
 thiserror = "1.0.23"
 
 [dev-dependencies]
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-tracing = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-tracing = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 futures = { version = "0.3.15", features = ["thread-pool"] }
 assert_matches = "1.4.0"
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
diff --git a/node/core/bitfield-signing/Cargo.toml b/node/core/bitfield-signing/Cargo.toml
index 4207cbbd6cc4..186e00a3249a 100644
--- a/node/core/bitfield-signing/Cargo.toml
+++ b/node/core/bitfield-signing/Cargo.toml
@@ -10,7 +10,7 @@ tracing = "0.1.26"
 polkadot-primitives = { path = "../../../primitives" }
 polkadot-node-subsystem = { path = "../../subsystem" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
-sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 wasm-timer = "0.2.5"
 thiserror = "1.0.23"
 
diff --git a/node/core/candidate-validation/Cargo.toml b/node/core/candidate-validation/Cargo.toml
index 6e388a99466d..2440873c363b 100644
--- a/node/core/candidate-validation/Cargo.toml
+++ b/node/core/candidate-validation/Cargo.toml
@@ -9,7 +9,7 @@ async-trait = "0.1.42"
 futures = "0.3.15"
 tracing = "0.1.26"
 
-sp-maybe-compressed-blob = { package = "sp-maybe-compressed-blob", git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-maybe-compressed-blob = { package = "sp-maybe-compressed-blob", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["bit-vec", "derive"] }
 
 polkadot-primitives = { path = "../../../primitives" }
@@ -22,8 +22,8 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 polkadot-node-core-pvf = { path = "../pvf" }
 
 [dev-dependencies]
-sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 futures = { version = "0.3.15", features = ["thread-pool"] }
 assert_matches = "1.4.0"
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
diff --git a/node/core/chain-api/Cargo.toml b/node/core/chain-api/Cargo.toml
index 986ed5b1643d..d4b60de3cac3 100644
--- a/node/core/chain-api/Cargo.toml
+++ b/node/core/chain-api/Cargo.toml
@@ -7,12 +7,12 @@ edition = "2018"
 [dependencies]
 futures = "0.3.15"
 tracing = "0.1.26"
-sp-blockchain = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-blockchain = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 polkadot-primitives = { path = "../../../primitives" }
 polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
-sc-client-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus-babe = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sc-client-api = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-consensus-babe = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 [dev-dependencies]
 futures = { version = "0.3.15", features = ["thread-pool"] }
@@ -20,4 +20,4 @@ maplit = "1.0.2"
 parity-scale-codec = "2.0.0"
 polkadot-node-primitives = { path = "../../primitives" }
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
diff --git a/node/core/chain-selection/Cargo.toml b/node/core/chain-selection/Cargo.toml
index e59c40319e15..0e0086154c98 100644
--- a/node/core/chain-selection/Cargo.toml
+++ b/node/core/chain-selection/Cargo.toml
@@ -19,7 +19,7 @@ parity-scale-codec = "2"
 
 [dev-dependencies]
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 parking_lot = "0.11"
 assert_matches = "1"
 kvdb-memorydb = "0.10.0"
diff --git a/node/core/dispute-coordinator/Cargo.toml b/node/core/dispute-coordinator/Cargo.toml
index c38b5cab2629..171b4eea4bb2 100644
--- a/node/core/dispute-coordinator/Cargo.toml
+++ b/node/core/dispute-coordinator/Cargo.toml
@@ -18,13 +18,13 @@ polkadot-node-primitives = { path = "../../primitives" }
 polkadot-node-subsystem = { path = "../../subsystem" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 
-sc-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sc-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 [dev-dependencies]
 kvdb-memorydb = "0.10.0"
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers"}
-sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 assert_matches = "1.4.0"
 polkadot-overseer = { path = "../../overseer" }
diff --git a/node/core/dispute-participation/Cargo.toml b/node/core/dispute-participation/Cargo.toml
index 9cee9800423b..9b4fb1ca75bc 100644
--- a/node/core/dispute-participation/Cargo.toml
+++ b/node/core/dispute-participation/Cargo.toml
@@ -17,4 +17,4 @@ polkadot-primitives = { path = "../../../primitives" }
 assert_matches = "1.5.0"
 parity-scale-codec = "2.0.0"
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers"}
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
diff --git a/node/core/parachains-inherent/Cargo.toml b/node/core/parachains-inherent/Cargo.toml
index aad8913b3a80..9c3b785d1543 100644
--- a/node/core/parachains-inherent/Cargo.toml
+++ b/node/core/parachains-inherent/Cargo.toml
@@ -12,6 +12,6 @@ thiserror = "1.0.23"
 async-trait = "0.1.47"
 polkadot-node-subsystem = { path = "../../subsystem" }
 polkadot-primitives = { path = "../../../primitives" }
-sp-blockchain = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-inherents = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-blockchain = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-inherents = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
diff --git a/node/core/provisioner/Cargo.toml b/node/core/provisioner/Cargo.toml
index 53c02a8d71af..64f501d76e83 100644
--- a/node/core/provisioner/Cargo.toml
+++ b/node/core/provisioner/Cargo.toml
@@ -15,6 +15,6 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 futures-timer = "3.0.2"
 
 [dev-dependencies]
-sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
diff --git a/node/core/pvf/Cargo.toml b/node/core/pvf/Cargo.toml
index f66b6f3afcc2..8cc01f517a49 100644
--- a/node/core/pvf/Cargo.toml
+++ b/node/core/pvf/Cargo.toml
@@ -23,15 +23,15 @@ rand = "0.8.3"
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
 polkadot-parachain = { path = "../../../parachain" }
 polkadot-core-primitives = { path = "../../../core-primitives" }
-sc-executor = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-executor-wasmtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-executor-common = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-externalities = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-wasm-interface = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-maybe-compressed-blob = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-tracing = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sc-executor = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-executor-wasmtime = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-executor-common = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-externalities = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-wasm-interface = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-maybe-compressed-blob = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-tracing = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 [dev-dependencies]
 adder = { package = "test-parachain-adder", path = "../../../parachain/test-parachains/adder" }
diff --git a/node/core/runtime-api/Cargo.toml b/node/core/runtime-api/Cargo.toml
index 3c53b306479a..8a44e15d7587 100644
--- a/node/core/runtime-api/Cargo.toml
+++ b/node/core/runtime-api/Cargo.toml
@@ -10,17 +10,17 @@ tracing = "0.1.26"
 memory-lru = "0.1.0"
 parity-util-mem = { version = "0.10.0", default-features = false }
 
-sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-authority-discovery = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus-babe = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-authority-discovery = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-consensus-babe = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 polkadot-primitives = { path = "../../../primitives" }
 polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 
 [dev-dependencies]
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 futures = { version = "0.3.15", features = ["thread-pool"] }
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
 polkadot-node-primitives = { path = "../../primitives" }
diff --git a/node/jaeger/Cargo.toml b/node/jaeger/Cargo.toml
index 894341182060..92f5879ac495 100644
--- a/node/jaeger/Cargo.toml
+++ b/node/jaeger/Cargo.toml
@@ -12,8 +12,8 @@ lazy_static = "1.4"
 parking_lot = "0.11.1"
 polkadot-primitives = { path = "../../primitives" }
 polkadot-node-primitives = { path = "../primitives" }
-sc-network = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sc-network = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 thiserror = "1.0.23"
 log = "0.4.13"
 parity-scale-codec = { version = "2.0.0", default-features = false }
diff --git a/node/metrics/Cargo.toml b/node/metrics/Cargo.toml
index c159678a59ae..ff75dbea35ca 100644
--- a/node/metrics/Cargo.toml
+++ b/node/metrics/Cargo.toml
@@ -12,8 +12,8 @@ futures-timer = "3.0.2"
 
 metered-channel = { path = "../metered-channel"}
 
-sc-network = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-substrate-prometheus-endpoint = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sc-network = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+substrate-prometheus-endpoint = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
diff --git a/node/network/approval-distribution/Cargo.toml b/node/network/approval-distribution/Cargo.toml
index 1733d1ae6c07..e6f82b7072fb 100644
--- a/node/network/approval-distribution/Cargo.toml
+++ b/node/network/approval-distribution/Cargo.toml
@@ -15,7 +15,7 @@ futures = "0.3.15"
 tracing = "0.1.26"
 
 [dev-dependencies]
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master", features = ["std"] }
+sp-core = { git = "/~https://github.com/paritytech/substrate", features = ["std"] , branch = "polkadot-v0.9.9" }
 
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
diff --git a/node/network/availability-distribution/Cargo.toml b/node/network/availability-distribution/Cargo.toml
index 9549dc64ea2e..bfef76e74e87 100644
--- a/node/network/availability-distribution/Cargo.toml
+++ b/node/network/availability-distribution/Cargo.toml
@@ -15,19 +15,19 @@ polkadot-node-network-protocol = { path = "../../network/protocol" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 polkadot-node-primitives = { path = "../../primitives" }
 polkadot-node-core-runtime-api = { path = "../../core/runtime-api" }
-sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master", features = ["std"]  }
-sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", features = ["std"]  , branch = "polkadot-v0.9.9" }
+sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 thiserror = "1.0.23"
 rand = "0.8.3"
 lru = "0.6.5"
 
 [dev-dependencies]
 polkadot-subsystem-testhelpers = { package = "polkadot-node-subsystem-test-helpers", path = "../../subsystem-test-helpers" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master", features = ["std"] }
-sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-tracing = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-network = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", features = ["std"] , branch = "polkadot-v0.9.9" }
+sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-tracing = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-network = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 futures-timer = "3.0.2"
 assert_matches = "1.4.0"
 maplit = "1.0"
diff --git a/node/network/availability-recovery/Cargo.toml b/node/network/availability-recovery/Cargo.toml
index 88897ffa8c4f..ddd9a441785b 100644
--- a/node/network/availability-recovery/Cargo.toml
+++ b/node/network/availability-recovery/Cargo.toml
@@ -25,9 +25,9 @@ env_logger = "0.8.4"
 futures-timer = "3.0.2"
 log = "0.4.11"
 
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-network = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-network = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 polkadot-subsystem-testhelpers = { package = "polkadot-node-subsystem-test-helpers", path = "../../subsystem-test-helpers" }
diff --git a/node/network/bitfield-distribution/Cargo.toml b/node/network/bitfield-distribution/Cargo.toml
index bfbf93fe0164..d6aedc54851c 100644
--- a/node/network/bitfield-distribution/Cargo.toml
+++ b/node/network/bitfield-distribution/Cargo.toml
@@ -15,9 +15,9 @@ polkadot-node-network-protocol = { path = "../../network/protocol" }
 [dev-dependencies]
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
 bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 maplit = "1.0.2"
 log = "0.4.13"
 env_logger = "0.8.4"
diff --git a/node/network/bridge/Cargo.toml b/node/network/bridge/Cargo.toml
index ee41be92e990..515ac34d34ce 100644
--- a/node/network/bridge/Cargo.toml
+++ b/node/network/bridge/Cargo.toml
@@ -10,8 +10,8 @@ futures = "0.3.15"
 tracing = "0.1.26"
 polkadot-primitives = { path = "../../../primitives" }
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
-sc-network = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sc-network = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-consensus = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
 polkadot-overseer = { path = "../../overseer" }
 polkadot-node-network-protocol = { path = "../protocol" }
@@ -22,6 +22,6 @@ parking_lot = "0.11.1"
 [dev-dependencies]
 assert_matches = "1.4.0"
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 futures-timer = "3"
diff --git a/node/network/collator-protocol/Cargo.toml b/node/network/collator-protocol/Cargo.toml
index df54cbdba45f..726685deee0c 100644
--- a/node/network/collator-protocol/Cargo.toml
+++ b/node/network/collator-protocol/Cargo.toml
@@ -11,9 +11,9 @@ futures-timer = "3"
 thiserror = "1.0.23"
 tracing = "0.1.26"
 
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 polkadot-primitives = { path = "../../../primitives" }
 polkadot-node-network-protocol = { path = "../../network/protocol" }
@@ -26,8 +26,8 @@ log = "0.4.13"
 env_logger = "0.8.4"
 assert_matches = "1.4.0"
 
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master", features = ["std"] }
-sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-network = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", features = ["std"] , branch = "polkadot-v0.9.9" }
+sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-network = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 polkadot-subsystem-testhelpers = { package = "polkadot-node-subsystem-test-helpers", path = "../../subsystem-test-helpers" }
diff --git a/node/network/dispute-distribution/Cargo.toml b/node/network/dispute-distribution/Cargo.toml
index 25c83986ba96..16e5f87e7b46 100644
--- a/node/network/dispute-distribution/Cargo.toml
+++ b/node/network/dispute-distribution/Cargo.toml
@@ -15,10 +15,10 @@ polkadot-node-network-protocol = { path = "../../network/protocol" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 polkadot-node-primitives = { path = "../../primitives" }
 polkadot-node-core-runtime-api = { path = "../../core/runtime-api" }
-sc-network = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master", features = ["std"]  }
-sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sc-network = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", features = ["std"]  , branch = "polkadot-v0.9.9" }
+sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 thiserror = "1.0.23"
 rand = "0.8.3"
 lru = "0.6.5"
@@ -26,11 +26,11 @@ lru = "0.6.5"
 [dev-dependencies]
 async-trait = "0.1.42"
 polkadot-subsystem-testhelpers = { package = "polkadot-node-subsystem-test-helpers", path = "../../subsystem-test-helpers" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master", features = ["std"] }
-sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-tracing = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-network = {git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", features = ["std"] , branch = "polkadot-v0.9.9" }
+sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-tracing = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-network = {git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 futures-timer = "3.0.2"
 assert_matches = "1.4.0"
 maplit = "1.0"
diff --git a/node/network/gossip-support/Cargo.toml b/node/network/gossip-support/Cargo.toml
index 9a6ef8a060fe..1856a89261b6 100644
--- a/node/network/gossip-support/Cargo.toml
+++ b/node/network/gossip-support/Cargo.toml
@@ -5,9 +5,9 @@ authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
 [dependencies]
-sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 polkadot-node-network-protocol = { path = "../protocol" }
 polkadot-node-subsystem = { path = "../../subsystem" }
@@ -20,9 +20,9 @@ rand_chacha = { version = "0.3.1", default-features = false }
 tracing = "0.1.26"
 
 [dev-dependencies]
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master", features = ["std"] }
-sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus-babe = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", features = ["std"] , branch = "polkadot-v0.9.9" }
+sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-consensus-babe = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
 
diff --git a/node/network/protocol/Cargo.toml b/node/network/protocol/Cargo.toml
index c459c932d9c5..77f289382a46 100644
--- a/node/network/protocol/Cargo.toml
+++ b/node/network/protocol/Cargo.toml
@@ -11,8 +11,8 @@ polkadot-primitives = { path = "../../../primitives" }
 polkadot-node-primitives = { path = "../../primitives" }
 polkadot-node-jaeger = { path = "../../jaeger" }
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
-sc-network = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-authority-discovery = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sc-network = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-authority-discovery = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 strum = { version = "0.20", features = ["derive"] }
 futures = "0.3.15"
 thiserror = "1.0.23"
diff --git a/node/network/statement-distribution/Cargo.toml b/node/network/statement-distribution/Cargo.toml
index 7dce5301eaea..329bcfc93b17 100644
--- a/node/network/statement-distribution/Cargo.toml
+++ b/node/network/statement-distribution/Cargo.toml
@@ -9,9 +9,9 @@ edition = "2018"
 futures = "0.3.15"
 tracing = "0.1.26"
 polkadot-primitives = { path = "../../../primitives" }
-sp-staking = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-network = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-staking = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-network = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
 polkadot-node-primitives = { path = "../../primitives" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
@@ -24,10 +24,10 @@ thiserror = "1.0.23"
 [dev-dependencies]
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
 assert_matches = "1.4.0"
-sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-tracing = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-tracing = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 futures-timer = "3.0.2"
diff --git a/node/overseer/Cargo.toml b/node/overseer/Cargo.toml
index dc5eff7aeeb3..96a365498e4a 100644
--- a/node/overseer/Cargo.toml
+++ b/node/overseer/Cargo.toml
@@ -6,8 +6,8 @@ edition = "2018"
 
 [dependencies]
 async-trait = "0.1.42"
-client = { package = "sc-client-api", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+client = { package = "sc-client-api", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 futures = "0.3.15"
 futures-timer = "3.0.2"
 parking_lot = "0.11.1"
@@ -23,7 +23,7 @@ lru = "0.6"
 
 [dev-dependencies]
 metered-channel = { path = "../metered-channel" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 futures = { version = "0.3.15", features = ["thread-pool"] }
 femme = "2.1.1"
 kv-log-macro = "1.0.7"
diff --git a/node/primitives/Cargo.toml b/node/primitives/Cargo.toml
index c88fd09c288c..560c0602ccb4 100644
--- a/node/primitives/Cargo.toml
+++ b/node/primitives/Cargo.toml
@@ -10,13 +10,13 @@ futures = "0.3.15"
 polkadot-primitives = { path = "../../primitives" }
 polkadot-statement-table = { path = "../../statement-table" }
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
-runtime_primitives = { package = "sp-runtime", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus-vrf = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus-babe = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-maybe-compressed-blob  = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+runtime_primitives = { package = "sp-runtime", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-consensus-vrf = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-consensus-babe = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-maybe-compressed-blob  = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 polkadot-parachain = { path = "../../parachain", default-features = false }
 schnorrkel = "0.9.1"
 thiserror = "1.0.22"
diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml
index 607c24623f39..39b764ceee18 100644
--- a/node/service/Cargo.toml
+++ b/node/service/Cargo.toml
@@ -6,58 +6,58 @@ edition = "2018"
 
 [dependencies]
 # Substrate Client
-sc-authority-discovery = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-babe = { package = "sc-consensus-babe", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-beefy-primitives = { git = "/~https://github.com/paritytech/grandpa-bridge-gadget", branch = "master" }
-beefy-gadget = { git = "/~https://github.com/paritytech/grandpa-bridge-gadget", branch = "master" }
-grandpa = { package = "sc-finality-grandpa", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-block-builder = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-chain-spec = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-client-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-client-db = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus-uncles = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus-slots = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-executor = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-network = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-transaction-pool = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-sync-state-rpc = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-basic-authorship = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-service = { package = "sc-service", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-telemetry = { package = "sc-telemetry", git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sc-authority-discovery = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+babe = { package = "sc-consensus-babe", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+beefy-primitives = { git = "/~https://github.com/paritytech/grandpa-bridge-gadget", branch = "polkadot-v0.9.9" }
+beefy-gadget = { git = "/~https://github.com/paritytech/grandpa-bridge-gadget", branch = "polkadot-v0.9.9" }
+grandpa = { package = "sc-finality-grandpa", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-block-builder = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-chain-spec = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-client-api = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-client-db = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-consensus-uncles = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-consensus = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-consensus-slots = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-executor = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-network = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-transaction-pool = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-sync-state-rpc = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-basic-authorship = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+service = { package = "sc-service", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+telemetry = { package = "sc-telemetry", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 # Substrate Primitives
-sp-authority-discovery = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-consensus_common = { package = "sp-consensus", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-grandpa_primitives = { package = "sp-finality-grandpa", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-inherents = { package = "sp-inherents", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-block-builder = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-blockchain = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-offchain = { package = "sp-offchain", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-session = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-storage = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-transaction-pool = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-trie = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-timestamp = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus-babe = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-state-machine = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-authority-discovery = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+consensus_common = { package = "sp-consensus", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+grandpa_primitives = { package = "sp-finality-grandpa", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+inherents = { package = "sp-inherents", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-block-builder = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-blockchain = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-offchain = { package = "sp-offchain", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-session = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-storage = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-transaction-pool = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-trie = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-timestamp = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-consensus-babe = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-state-machine = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 # Substrate Pallets
-pallet-babe = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-im-online = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-staking = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-transaction-payment-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-mmr-primitives = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+pallet-babe = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-im-online = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-staking = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-transaction-payment-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-mmr-primitives = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 # Substrate Other
-frame-system-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "/~https://github.com/paritytech/substrate", branch = "master" }
+frame-system-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 # External Crates
 futures = "0.3.15"
diff --git a/node/subsystem-test-helpers/Cargo.toml b/node/subsystem-test-helpers/Cargo.toml
index b8ce766d473d..696fd10c13e5 100644
--- a/node/subsystem-test-helpers/Cargo.toml
+++ b/node/subsystem-test-helpers/Cargo.toml
@@ -18,13 +18,13 @@ polkadot-node-subsystem = { path = "../subsystem" }
 polkadot-node-subsystem-util = { path = "../subsystem-util" }
 polkadot-primitives = { path = "../../primitives" }
 polkadot-statement-table = { path = "../../statement-table" }
-sc-network = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sc-network = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 smallvec = "1.6.1"
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", branch = "master"}
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 [dev-dependencies]
 polkadot-overseer = { path = "../overseer" }
diff --git a/node/subsystem-types/Cargo.toml b/node/subsystem-types/Cargo.toml
index 4f9e871803a5..1fe844a49ee9 100644
--- a/node/subsystem-types/Cargo.toml
+++ b/node/subsystem-types/Cargo.toml
@@ -23,10 +23,10 @@ polkadot-node-network-protocol = { path = "../network/protocol" }
 polkadot-statement-table = { path = "../../statement-table" }
 polkadot-node-jaeger = { path = "../jaeger" }
 polkadot-overseer-gen = { path = "../overseer/overseer-gen" }
-sc-network = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sc-network = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 smallvec = "1.6.1"
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-substrate-prometheus-endpoint = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+substrate-prometheus-endpoint = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 thiserror = "1.0.23"
 log = "0.4.13"
 
diff --git a/node/subsystem-util/Cargo.toml b/node/subsystem-util/Cargo.toml
index fc75baedee6f..78e35b80bd79 100644
--- a/node/subsystem-util/Cargo.toml
+++ b/node/subsystem-util/Cargo.toml
@@ -27,11 +27,11 @@ polkadot-primitives = { path = "../../primitives" }
 polkadot-overseer = { path = "../overseer" }
 metered-channel = { path = "../metered-channel"}
 
-sc-network = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-substrate-prometheus-endpoint = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sc-network = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+substrate-prometheus-endpoint = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 [dev-dependencies]
 assert_matches = "1.4.0"
diff --git a/node/test/client/Cargo.toml b/node/test/client/Cargo.toml
index 46d8b16ee202..335855a98f6a 100644
--- a/node/test/client/Cargo.toml
+++ b/node/test/client/Cargo.toml
@@ -14,20 +14,20 @@ polkadot-primitives = { path = "../../../primitives" }
 polkadot-node-subsystem = { path = "../../subsystem" }
 
 # Substrate dependencies
-substrate-test-client = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-service = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-block-builder = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-blockchain = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-inherents = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-timestamp = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus-babe = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-state-machine = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+substrate-test-client = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-service = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-block-builder = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-consensus = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-blockchain = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-inherents = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-timestamp = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-consensus = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-consensus-babe = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-state-machine = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 [dev-dependencies]
-sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 futures = "0.3.15"
diff --git a/node/test/polkadot-simnet/common/Cargo.toml b/node/test/polkadot-simnet/common/Cargo.toml
index 739e2cbae071..ceeafd334413 100644
--- a/node/test/polkadot-simnet/common/Cargo.toml
+++ b/node/test/polkadot-simnet/common/Cargo.toml
@@ -5,31 +5,31 @@ authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
 [dependencies]
-system = { package = "frame-system", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-support = { package = "frame-support", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-benchmarking = { package = "frame-benchmarking", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-transaction-payment = { package = "pallet-transaction-payment", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-collective = { package = "pallet-collective", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-democracy = { package = "pallet-democracy", git = "/~https://github.com/paritytech/substrate", branch = "master" }
+system = { package = "frame-system", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+support = { package = "frame-support", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+benchmarking = { package = "frame-benchmarking", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+transaction-payment = { package = "pallet-transaction-payment", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+collective = { package = "pallet-collective", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+democracy = { package = "pallet-democracy", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
-test-runner = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-grandpa = { package = "sc-finality-grandpa", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus-babe = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus-manual-seal = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-service = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-executor = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-transaction-pool = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-tracing = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-cli = { git = "/~https://github.com/paritytech/substrate", branch = "master"  }
+test-runner = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+grandpa = { package = "sc-finality-grandpa", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-consensus-babe = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-consensus-manual-seal = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-service = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-executor = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-transaction-pool = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-consensus = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-tracing = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-cli = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
-sp-consensus-babe = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-inherents = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-consensus-babe = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-inherents = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-consensus = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 polkadot-primitives = { path = "../../../../primitives" }
 polkadot-cli = { path = "../../../../cli", features = ["cli"] }
diff --git a/node/test/polkadot-simnet/common/src/lib.rs b/node/test/polkadot-simnet/common/src/lib.rs
index 7b0be2151cbe..32e481e2f141 100644
--- a/node/test/polkadot-simnet/common/src/lib.rs
+++ b/node/test/polkadot-simnet/common/src/lib.rs
@@ -129,7 +129,7 @@ where
 		// note the call (pre-image?) of the call.
 		node.submit_extrinsic(
 			DemocracyCall::note_preimage(call.into().encode()),
-			whales[0].clone(),
+			Some(whales[0].clone()),
 		)
 		.await?;
 		node.seal_blocks(1).await;
@@ -161,7 +161,8 @@ where
 			length,
 		);
 
-		node.submit_extrinsic(proposal.clone(), council_collective[0].clone()).await?;
+		node.submit_extrinsic(proposal.clone(), Some(council_collective[0].clone()))
+			.await?;
 		node.seal_blocks(1).await;
 
 		// fetch proposal index from event emitted by the runtime
@@ -181,13 +182,13 @@ where
 		// vote
 		for member in &council_collective[1..] {
 			let call = CouncilCollectiveCall::vote(hash.clone(), index, true);
-			node.submit_extrinsic(call, member.clone()).await?;
+			node.submit_extrinsic(call, Some(member.clone())).await?;
 		}
 		node.seal_blocks(1).await;
 
 		// close vote
 		let call = CouncilCollectiveCall::close(hash, index, weight, length);
-		node.submit_extrinsic(call, council_collective[0].clone()).await?;
+		node.submit_extrinsic(call, Some(council_collective[0].clone())).await?;
 		node.seal_blocks(1).await;
 
 		// assert that proposal has been passed on chain
@@ -226,7 +227,7 @@ where
 			length,
 		);
 
-		node.submit_extrinsic(proposal, technical_collective[0].clone()).await?;
+		node.submit_extrinsic(proposal, Some(technical_collective[0].clone())).await?;
 		node.seal_blocks(1).await;
 
 		let events = node.events();
@@ -249,13 +250,13 @@ where
 		// vote
 		for member in &technical_collective[1..] {
 			let call = TechnicalCollectiveCall::vote(hash.clone(), index, true);
-			node.submit_extrinsic(call, member.clone()).await?;
+			node.submit_extrinsic(call, Some(member.clone())).await?;
 		}
 		node.seal_blocks(1).await;
 
 		// close vote
 		let call = TechnicalCollectiveCall::close(hash, index, weight, length);
-		node.submit_extrinsic(call, technical_collective[0].clone()).await?;
+		node.submit_extrinsic(call, Some(technical_collective[0].clone())).await?;
 		node.seal_blocks(1).await;
 
 		// assert that fast-track proposal has been passed on chain
@@ -307,7 +308,7 @@ where
 		},
 	);
 	for whale in whales {
-		node.submit_extrinsic(call.clone(), whale).await?;
+		node.submit_extrinsic(call.clone(), Some(whale)).await?;
 	}
 
 	// wait for fast track period.
@@ -395,7 +396,7 @@ mod tests {
 			node.seal_blocks(1).await;
 			// submit extrinsics
 			let alice = MultiSigner::from(Alice.public()).into_account();
-			node.submit_extrinsic(system::Call::remark((b"hello world").to_vec()), alice)
+			node.submit_extrinsic(system::Call::remark((b"hello world").to_vec()), Some(alice))
 				.await
 				.unwrap();
 
diff --git a/node/test/polkadot-simnet/test/Cargo.toml b/node/test/polkadot-simnet/test/Cargo.toml
index d73b1c990c63..92e4bac886fd 100644
--- a/node/test/polkadot-simnet/test/Cargo.toml
+++ b/node/test/polkadot-simnet/test/Cargo.toml
@@ -6,16 +6,16 @@ edition = "2018"
 
 [dependencies]
 # substrate primitives
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-blockchain = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-blockchain = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 # frame pallets
-system = { package = "frame-system", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-balances = { package = "pallet-balances", git = "/~https://github.com/paritytech/substrate", branch = "master" }
+system = { package = "frame-system", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+balances = { package = "pallet-balances", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 # substrate client libs
-sc-client-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sc-client-api = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 # polkadot deps
 polkadot-simnet = { path = "../common" }
diff --git a/node/test/polkadot-simnet/test/src/main.rs b/node/test/polkadot-simnet/test/src/main.rs
index 3d0771b8d659..240167aa54fe 100644
--- a/node/test/polkadot-simnet/test/src/main.rs
+++ b/node/test/polkadot-simnet/test/src/main.rs
@@ -74,7 +74,7 @@ fn main() -> Result<(), Box<dyn Error>> {
 		);
 
 		// post upgrade tests, a simple balance transfer
-		node.submit_extrinsic(balances::Call::transfer(dest.into(), balance), from)
+		node.submit_extrinsic(balances::Call::transfer(dest.into(), balance), Some(from))
 			.await?;
 		node.seal_blocks(1).await;
 
diff --git a/node/test/service/Cargo.toml b/node/test/service/Cargo.toml
index 6881205621ab..0415fa241dfa 100644
--- a/node/test/service/Cargo.toml
+++ b/node/test/service/Cargo.toml
@@ -25,38 +25,38 @@ polkadot-test-runtime = { path = "../../../runtime/test-runtime" }
 polkadot-runtime-parachains = { path = "../../../runtime/parachains" }
 
 # Substrate dependencies
-sp-authority-discovery = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-authority-discovery = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-babe = { package = "sc-consensus-babe", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-babe-primitives = { package = "sp-consensus-babe", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-consensus_common = { package = "sp-consensus", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-frame-benchmarking = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-grandpa = { package = "sc-finality-grandpa", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-grandpa_primitives = { package = "sp-finality-grandpa", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-inherents = { package = "sp-inherents", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-staking = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-balances = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-chain-spec = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-cli = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-client-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-executor = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-network = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-tracing = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-transaction-pool = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-service = { package = "sc-service", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-arithmetic = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-blockchain = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-state-machine = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-substrate-test-client = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-authority-discovery = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-authority-discovery = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+babe = { package = "sc-consensus-babe", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+babe-primitives = { package = "sp-consensus-babe", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+consensus_common = { package = "sp-consensus", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+frame-benchmarking = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+grandpa = { package = "sc-finality-grandpa", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+grandpa_primitives = { package = "sp-finality-grandpa", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+inherents = { package = "sp-inherents", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-staking = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-balances = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-chain-spec = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-cli = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-client-api = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-consensus = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-executor = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-network = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-tracing = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-transaction-pool = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+service = { package = "sc-service", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-arithmetic = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-blockchain = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-state-machine = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+substrate-test-client = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 [dev-dependencies]
-pallet-balances = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+pallet-balances = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 serde_json = "1.0.61"
-substrate-test-utils = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+substrate-test-utils = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 tokio = { version = "0.2", features = ["macros"] }
diff --git a/parachain/Cargo.toml b/parachain/Cargo.toml
index e4ff85cc20ec..9817f98ebb0d 100644
--- a/parachain/Cargo.toml
+++ b/parachain/Cargo.toml
@@ -11,10 +11,10 @@ edition = "2018"
 # various unnecessary Substrate-specific endpoints.
 parity-scale-codec = { version = "2.0.0", default-features = false, features = [ "derive" ] }
 parity-util-mem = { version = "0.10.0", optional = true }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 polkadot-core-primitives = { path = "../core-primitives", default-features = false }
 derive_more = "0.99.11"
 
diff --git a/parachain/test-parachains/Cargo.toml b/parachain/test-parachains/Cargo.toml
index 9589be294775..0c8a66b55bb2 100644
--- a/parachain/test-parachains/Cargo.toml
+++ b/parachain/test-parachains/Cargo.toml
@@ -14,7 +14,7 @@ adder = { package = "test-parachain-adder", path = "adder" }
 halt = { package = "test-parachain-halt", path = "halt" }
 
 [dev-dependencies]
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 [features]
 default = [ "std" ]
diff --git a/parachain/test-parachains/adder/Cargo.toml b/parachain/test-parachains/adder/Cargo.toml
index 80cd51ea8de5..d9e8f8bbd51e 100644
--- a/parachain/test-parachains/adder/Cargo.toml
+++ b/parachain/test-parachains/adder/Cargo.toml
@@ -9,15 +9,15 @@ build = "build.rs"
 [dependencies]
 parachain = { package = "polkadot-parachain", path = "../../", default-features = false, features = [ "wasm-api" ] }
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 tiny-keccak = { version = "2.0.2", features = ["keccak"] }
 dlmalloc = { version = "0.2.1", features = [ "global" ] }
 
 # We need to make sure the global allocator is disabled until we have support of full substrate externalities
-sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false, features = [ "disable_allocator" ] }
+sp-io = { git = "/~https://github.com/paritytech/substrate", default-features = false, features = [ "disable_allocator" ] , branch = "polkadot-v0.9.9" }
 
 [build-dependencies]
-substrate-wasm-builder = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+substrate-wasm-builder = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 [features]
 default = [ "std" ]
diff --git a/parachain/test-parachains/adder/collator/Cargo.toml b/parachain/test-parachains/adder/collator/Cargo.toml
index 1d1605df9f39..b0594b287da1 100644
--- a/parachain/test-parachains/adder/collator/Cargo.toml
+++ b/parachain/test-parachains/adder/collator/Cargo.toml
@@ -27,10 +27,10 @@ polkadot-service = { path = "../../../../node/service", features = [ "rococo-nat
 polkadot-node-primitives = { path = "../../../../node/primitives" }
 polkadot-node-subsystem = { path = "../../../../node/subsystem" }
 
-sc-cli = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-authority-discovery = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-service = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sc-cli = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-authority-discovery = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-service = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 # This one is tricky. Even though it is not used directly by the collator, we still need it for the
 # `puppet_worker` binary, which is required for the integration test. However, this shouldn't be
@@ -41,8 +41,8 @@ polkadot-node-core-pvf = { path = "../../../../node/core/pvf" }
 polkadot-parachain = { path = "../../.." }
 polkadot-test-service = { path = "../../../../node/test/service" }
 
-substrate-test-utils = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-service = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+substrate-test-utils = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-service = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 tokio = { version = "0.2", features = ["macros"] }
diff --git a/parachain/test-parachains/halt/Cargo.toml b/parachain/test-parachains/halt/Cargo.toml
index c191cce20d06..29447792e2a2 100644
--- a/parachain/test-parachains/halt/Cargo.toml
+++ b/parachain/test-parachains/halt/Cargo.toml
@@ -9,7 +9,7 @@ build = "build.rs"
 [dependencies]
 
 [build-dependencies]
-substrate-wasm-builder = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+substrate-wasm-builder = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 [features]
 default = [ "std" ]
diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
index a1b4d96c2911..ba6c52b01af1 100644
--- a/primitives/Cargo.toml
+++ b/primitives/Cargo.toml
@@ -7,30 +7,30 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.123", optional = true, features = ["derive"] }
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["bit-vec", "derive"] }
-primitives = { package = "sp-core", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-inherents = { package = "sp-inherents", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-application-crypto = { package = "sp-application-crypto", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-consensus-slots = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master", optional = true }
-sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-version = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-std = { package = "sp-std", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-staking = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-arithmetic = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-authority-discovery = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-runtime_primitives = { package = "sp-runtime", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+primitives = { package = "sp-core", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+inherents = { package = "sp-inherents", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+application-crypto = { package = "sp-application-crypto", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-consensus-slots = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-keystore = { git = "/~https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.9" }
+sp-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-version = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { package = "sp-std", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-io = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-staking = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-arithmetic = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-authority-discovery = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+runtime_primitives = { package = "sp-runtime", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 polkadot-parachain = { path = "../parachain", default-features = false }
 polkadot-core-primitives = { path = "../core-primitives", default-features = false }
-trie = { package = "sp-trie", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+trie = { package = "sp-trie", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] }
-frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+frame-system = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 hex-literal = "0.3.1"
 parity-util-mem = { version = "0.10.0", default-features = false, optional = true }
 thiserror = "1.0.23"
 
 [dev-dependencies]
-sp-serializer = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-serializer = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 pretty_assertions = "0.7.2"
 
 [features]
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index b017ead54499..46ce65b18cd1 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -7,27 +7,27 @@ edition = "2018"
 [dependencies]
 jsonrpc-core = "15.1.0"
 polkadot-primitives = { path = "../primitives" }
-sc-client-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-blockchain = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus-babe = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-chain-spec = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-rpc = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus-babe = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus-babe-rpc = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus-epochs = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-finality-grandpa-rpc = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-sync-state-rpc = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-txpool-api = { package = "sc-transaction-pool-api", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-frame-rpc-system = { package = "substrate-frame-rpc-system", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-mmr-rpc = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-transaction-payment-rpc = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sc-client-api = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-blockchain = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-consensus = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-consensus-babe = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-chain-spec = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-rpc = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-consensus-babe = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-consensus-babe-rpc = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-consensus-epochs = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-finality-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-finality-grandpa-rpc = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-sync-state-rpc = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+txpool-api = { package = "sc-transaction-pool-api", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+frame-rpc-system = { package = "substrate-frame-rpc-system", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-mmr-rpc = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-transaction-payment-rpc = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 parity-scale-codec = { version = "2.0.0", default-features = false }
-sp-block-builder = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-beefy-gadget = { git = "/~https://github.com/paritytech/grandpa-bridge-gadget", branch = "master" }
-beefy-gadget-rpc = { git = "/~https://github.com/paritytech/grandpa-bridge-gadget", branch = "master" }
+sp-block-builder = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+beefy-gadget = { git = "/~https://github.com/paritytech/grandpa-bridge-gadget", branch = "polkadot-v0.9.9" }
+beefy-gadget-rpc = { git = "/~https://github.com/paritytech/grandpa-bridge-gadget", branch = "polkadot-v0.9.9" }
diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
index 142783653692..c241b290274d 100644
--- a/runtime/common/Cargo.toml
+++ b/runtime/common/Cargo.toml
@@ -14,31 +14,31 @@ serde = { version = "1.0.123", default-features = false }
 serde_derive = { version = "1.0.117", optional = true }
 static_assertions = "1.1.0"
 
-sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-inherents = { package = "sp-inherents", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-std = { package = "sp-std", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-session = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-staking = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+inherents = { package = "sp-inherents", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { package = "sp-std", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-io = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-session = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-staking = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
-pallet-authorship = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-balances = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-session = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-staking = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-system = {git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-timestamp = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-vesting = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-offences = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-treasury = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-election-provider-multi-phase = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-beefy-mmr = { git = "/~https://github.com/paritytech/grandpa-bridge-gadget", branch = "master", default-features = false }
+pallet-authorship = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-balances = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-session = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-staking = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-system = {git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-timestamp = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-vesting = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-offences = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-treasury = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-election-provider-multi-phase = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-beefy-mmr = { git = "/~https://github.com/paritytech/grandpa-bridge-gadget", default-features = false , branch = "polkadot-v0.9.9" }
 
-frame-benchmarking = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
-pallet-babe = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features=false, optional = true }
+frame-benchmarking = { git = "/~https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.9" }
+pallet-babe = { git = "/~https://github.com/paritytech/substrate", default-features=false, optional = true , branch = "polkadot-v0.9.9" }
 
 primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
 libsecp256k1 = { version = "0.6.0", default-features = false }
@@ -49,14 +49,14 @@ xcm = { path = "../../xcm", default-features = false }
 
 [dev-dependencies]
 hex-literal = "0.3.1"
-keyring = { package = "sp-keyring", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-trie = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-frame-support-test = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-babe = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-staking-reward-curve = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-treasury = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+keyring = { package = "sp-keyring", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-trie = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+frame-support-test = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-babe = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-staking-reward-curve = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-treasury = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 trie-db = "0.22.3"
 serde_json = "1.0.61"
 libsecp256k1 = "0.6.0"
diff --git a/runtime/common/slot_range_helper/Cargo.toml b/runtime/common/slot_range_helper/Cargo.toml
index 54d1fe693d0b..7528a3d7fa94 100644
--- a/runtime/common/slot_range_helper/Cargo.toml
+++ b/runtime/common/slot_range_helper/Cargo.toml
@@ -8,8 +8,8 @@ edition = "2018"
 paste = "1.0"
 enumn = "0.1.3"
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { package = "sp-std", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-std = { package = "sp-std", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
 [features]
 default = ["std"]
diff --git a/runtime/common/src/auctions.rs b/runtime/common/src/auctions.rs
index 9ff037deb378..3e9a5e0b5cb6 100644
--- a/runtime/common/src/auctions.rs
+++ b/runtime/common/src/auctions.rs
@@ -683,7 +683,7 @@ mod tests {
 		pub const BlockHashCount: u32 = 250;
 	}
 	impl frame_system::Config for Test {
-		type BaseCallFilter = frame_support::traits::AllowAll;
+		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = ();
 		type BlockLength = ();
 		type DbWeight = ();
diff --git a/runtime/common/src/claims.rs b/runtime/common/src/claims.rs
index 7a36a0ecae71..af170c1e96f6 100644
--- a/runtime/common/src/claims.rs
+++ b/runtime/common/src/claims.rs
@@ -731,7 +731,7 @@ mod tests {
 		pub const BlockHashCount: u32 = 250;
 	}
 	impl frame_system::Config for Test {
-		type BaseCallFilter = frame_support::traits::AllowAll;
+		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = ();
 		type BlockLength = ();
 		type DbWeight = ();
diff --git a/runtime/common/src/crowdloan.rs b/runtime/common/src/crowdloan.rs
index 7ceff18e2461..e0dc0d4c8395 100644
--- a/runtime/common/src/crowdloan.rs
+++ b/runtime/common/src/crowdloan.rs
@@ -838,7 +838,7 @@ mod tests {
 	type BlockNumber = u64;
 
 	impl frame_system::Config for Test {
-		type BaseCallFilter = frame_support::traits::AllowAll;
+		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = ();
 		type BlockLength = ();
 		type DbWeight = ();
diff --git a/runtime/common/src/impls.rs b/runtime/common/src/impls.rs
index 28990a0929c4..4af64ce6acda 100644
--- a/runtime/common/src/impls.rs
+++ b/runtime/common/src/impls.rs
@@ -111,7 +111,7 @@ mod tests {
 	}
 
 	impl frame_system::Config for Test {
-		type BaseCallFilter = frame_support::traits::AllowAll;
+		type BaseCallFilter = frame_support::traits::Everything;
 		type Origin = Origin;
 		type Index = u64;
 		type BlockNumber = u64;
diff --git a/runtime/common/src/integration_tests.rs b/runtime/common/src/integration_tests.rs
index d25aac6bc7cf..50a1e9efaaac 100644
--- a/runtime/common/src/integration_tests.rs
+++ b/runtime/common/src/integration_tests.rs
@@ -79,7 +79,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = BlockWeights;
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs
index a2ce71c558ee..704924a411db 100644
--- a/runtime/common/src/lib.rs
+++ b/runtime/common/src/lib.rs
@@ -216,7 +216,7 @@ mod multiplier_tests {
 	}
 
 	impl frame_system::Config for Runtime {
-		type BaseCallFilter = frame_support::traits::AllowAll;
+		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = BlockWeights;
 		type BlockLength = ();
 		type DbWeight = ();
diff --git a/runtime/common/src/paras_registrar.rs b/runtime/common/src/paras_registrar.rs
index 451e804beb12..c914bcdb22f7 100644
--- a/runtime/common/src/paras_registrar.rs
+++ b/runtime/common/src/paras_registrar.rs
@@ -592,7 +592,7 @@ mod tests {
 	}
 
 	impl frame_system::Config for Test {
-		type BaseCallFilter = frame_support::traits::AllowAll;
+		type BaseCallFilter = frame_support::traits::Everything;
 		type Origin = Origin;
 		type Call = Call;
 		type Index = u64;
diff --git a/runtime/common/src/purchase.rs b/runtime/common/src/purchase.rs
index 0b4a1303b13f..3aaa069d9438 100644
--- a/runtime/common/src/purchase.rs
+++ b/runtime/common/src/purchase.rs
@@ -497,7 +497,7 @@ mod tests {
 		pub const BlockHashCount: u32 = 250;
 	}
 	impl frame_system::Config for Test {
-		type BaseCallFilter = frame_support::traits::AllowAll;
+		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = ();
 		type BlockLength = ();
 		type DbWeight = ();
diff --git a/runtime/common/src/slots.rs b/runtime/common/src/slots.rs
index 658f5d20c491..0dac47c71136 100644
--- a/runtime/common/src/slots.rs
+++ b/runtime/common/src/slots.rs
@@ -507,7 +507,7 @@ mod tests {
 		pub const BlockHashCount: u32 = 250;
 	}
 	impl frame_system::Config for Test {
-		type BaseCallFilter = frame_support::traits::AllowAll;
+		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = ();
 		type BlockLength = ();
 		type Origin = Origin;
diff --git a/runtime/kusama/Cargo.toml b/runtime/kusama/Cargo.toml
index 3c2d7aa8d08a..e2ed8b226b3e 100644
--- a/runtime/kusama/Cargo.toml
+++ b/runtime/kusama/Cargo.toml
@@ -15,69 +15,69 @@ serde_derive = { version = "1.0.117", optional = true }
 static_assertions = "1.1.0"
 smallvec = "1.6.1"
 
-authority-discovery-primitives = { package = "sp-authority-discovery", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-babe-primitives = { package = "sp-consensus-babe", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-beefy-primitives = { git = "/~https://github.com/paritytech/grandpa-bridge-gadget", branch = "master", default-features = false }
-sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-inherents = { package = "sp-inherents", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-offchain-primitives = { package = "sp-offchain", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-std = { package = "sp-std", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-arithmetic = { package = "sp-arithmetic", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-staking = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-session = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-version = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-tx-pool-api = { package = "sp-transaction-pool", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-block-builder-api = { package = "sp-block-builder", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-npos-elections = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+authority-discovery-primitives = { package = "sp-authority-discovery", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+babe-primitives = { package = "sp-consensus-babe", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+beefy-primitives = { git = "/~https://github.com/paritytech/grandpa-bridge-gadget", default-features = false , branch = "polkadot-v0.9.9" }
+sp-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+inherents = { package = "sp-inherents", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+offchain-primitives = { package = "sp-offchain", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { package = "sp-std", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-arithmetic = { package = "sp-arithmetic", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-io = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-staking = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-session = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-version = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+tx-pool-api = { package = "sp-transaction-pool", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+block-builder-api = { package = "sp-block-builder", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-npos-elections = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
-pallet-authority-discovery = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-authorship = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-babe = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-balances = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-bounties = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-transaction-payment-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-collective = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-democracy = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-elections-phragmen = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-election-provider-multi-phase = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-executive = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-gilt = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-identity = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-im-online = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-indices = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-membership = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-mmr-primitives = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-multisig = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-nicks = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-offences = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-proxy = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-recovery = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-scheduler = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-session = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-society = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-staking = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-staking-reward-fn = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-system = {git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-system-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-timestamp = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-tips = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-treasury = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-utility = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-vesting = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+pallet-authority-discovery = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-authorship = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-babe = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-balances = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-bounties = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-transaction-payment-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-collective = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-democracy = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-elections-phragmen = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-election-provider-multi-phase = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-executive = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-grandpa = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-gilt = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-identity = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-im-online = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-indices = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-membership = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-mmr-primitives = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-multisig = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-nicks = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-offences = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-proxy = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-recovery = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-scheduler = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-session = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-society = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-staking = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-staking-reward-fn = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-system = {git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-system-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-timestamp = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-tips = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-treasury = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-utility = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-vesting = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 pallet-xcm = { path = "../../xcm/pallet-xcm", default-features = false }
-frame-election-provider-support = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+frame-election-provider-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
-frame-benchmarking = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
-frame-try-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
-pallet-offences-benchmarking = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
-pallet-session-benchmarking = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
-frame-system-benchmarking = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
+frame-benchmarking = { git = "/~https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.9" }
+frame-try-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.9" }
+pallet-offences-benchmarking = { git = "/~https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.9" }
+pallet-session-benchmarking = { git = "/~https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.9" }
+frame-system-benchmarking = { git = "/~https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.9" }
 hex-literal = { version = "0.3.1", optional = true }
 
 runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
@@ -91,13 +91,13 @@ xcm-builder = { package = "xcm-builder", path = "../../xcm/xcm-builder", default
 [dev-dependencies]
 hex-literal = "0.3.1"
 tiny-keccak = "2.0.2"
-keyring = { package = "sp-keyring", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-trie = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+keyring = { package = "sp-keyring", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-trie = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 separator = "0.4.1"
 serde_json = "1.0.61"
 
 [build-dependencies]
-substrate-wasm-builder = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+substrate-wasm-builder = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 [features]
 default = ["std"]
diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs
index c4f0da4cfafb..4ff97cde9e78 100644
--- a/runtime/kusama/src/lib.rs
+++ b/runtime/kusama/src/lib.rs
@@ -49,7 +49,9 @@ use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId;
 use beefy_primitives::crypto::AuthorityId as BeefyId;
 use frame_support::{
 	construct_runtime, parameter_types,
-	traits::{All, Filter, InstanceFilter, KeyOwnerProofSystem, LockIdentifier, OnRuntimeUpgrade},
+	traits::{
+		Contains, Everything, InstanceFilter, KeyOwnerProofSystem, LockIdentifier, OnRuntimeUpgrade,
+	},
 	weights::Weight,
 	PalletId, RuntimeDebug,
 };
@@ -142,8 +144,8 @@ pub fn native_version() -> NativeVersion {
 
 /// Don't allow swaps until parathread story is more mature.
 pub struct BaseFilter;
-impl Filter<Call> for BaseFilter {
-	fn filter(c: &Call) -> bool {
+impl Contains<Call> for BaseFilter {
+	fn contains(c: &Call) -> bool {
 		!matches!(c, Call::Registrar(paras_registrar::Call::swap(..)))
 	}
 }
@@ -1278,7 +1280,7 @@ pub type Barrier = (
 	// Weight that is paid for may be consumed.
 	TakeWeightCredit,
 	// If the message is one that immediately attemps to pay for execution, then allow it.
-	AllowTopLevelPaidExecutionFrom<All<MultiLocation>>,
+	AllowTopLevelPaidExecutionFrom<Everything>,
 	// Messages coming from system parachains need not pay for execution.
 	AllowUnpaidExecutionFrom<IsChildSystemParachain<ParaId>>,
 );
@@ -1377,8 +1379,8 @@ impl pallet_xcm::Config for Runtime {
 	// ...but they must match our filter, which requires them to be a simple withdraw + teleport.
 	type XcmExecuteFilter = OnlyWithdrawTeleportForAccounts;
 	type XcmExecutor = XcmExecutor<XcmConfig>;
-	type XcmTeleportFilter = All<(MultiLocation, Vec<MultiAsset>)>;
-	type XcmReserveTransferFilter = All<(MultiLocation, Vec<MultiAsset>)>;
+	type XcmTeleportFilter = Everything;
+	type XcmReserveTransferFilter = Everything;
 	type Weigher = FixedWeightBounds<BaseXcmWeight, Call>;
 	type LocationInverter = LocationInverter<Ancestry>;
 }
@@ -1540,7 +1542,7 @@ pub type Executive = frame_executive::Executive<
 	frame_system::ChainContext<Runtime>,
 	Runtime,
 	AllPallets,
-	(RemoveCollectiveFlip, MigratePalletVersionToStorageVersion),
+	MigratePalletVersionToStorageVersion,
 >;
 /// The payload being signed in the transactions.
 pub type SignedPayload = generic::SignedPayload<Call, SignedExtra>;
@@ -1556,16 +1558,6 @@ impl OnRuntimeUpgrade for MigratePalletVersionToStorageVersion {
 	}
 }
 
-pub struct RemoveCollectiveFlip;
-impl frame_support::traits::OnRuntimeUpgrade for RemoveCollectiveFlip {
-	fn on_runtime_upgrade() -> Weight {
-		use frame_support::storage::migration;
-		// Remove the storage value `RandomMaterial` from removed pallet `RandomnessCollectiveFlip`
-		migration::remove_storage_prefix(b"RandomnessCollectiveFlip", b"RandomMaterial", b"");
-		<Runtime as frame_system::Config>::DbWeight::get().writes(1)
-	}
-}
-
 #[cfg(not(feature = "disable-runtime-api"))]
 sp_api::impl_runtime_apis! {
 	impl sp_api::Core<Block> for Runtime {
diff --git a/runtime/parachains/Cargo.toml b/runtime/parachains/Cargo.toml
index c16669cf7df6..ddc061138a8f 100644
--- a/runtime/parachains/Cargo.toml
+++ b/runtime/parachains/Cargo.toml
@@ -13,27 +13,27 @@ serde = { version = "1.0.123", features = [ "derive" ], optional = true }
 derive_more = "0.99.14"
 bitflags = "1"
 
-sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-inherents = { package = "sp-inherents", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-std = { package = "sp-std", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-session = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-staking = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master", optional = true }
+sp-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+inherents = { package = "sp-inherents", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { package = "sp-std", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-io = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-session = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-staking = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-keystore = { git = "/~https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.9" }
 
-pallet-authority-discovery = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-authorship = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-balances = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-session = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-staking = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-system = {git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-timestamp = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-vesting = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-offences = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-benchmarking = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
+pallet-authority-discovery = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-authorship = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-balances = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-session = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-staking = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-system = {git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-timestamp = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-vesting = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-offences = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-benchmarking = { git = "/~https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.9" }
 
 xcm = { package = "xcm", path = "../../xcm", default-features = false }
 xcm-executor = { package = "xcm-executor", path = "../../xcm/xcm-executor", default-features = false }
@@ -45,16 +45,16 @@ rand_chacha = { version = "0.3.1", default-features = false }
 [dev-dependencies]
 futures = "0.3.15"
 hex-literal = "0.3.1"
-keyring = { package = "sp-keyring", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-trie = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-babe = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-staking-reward-curve = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-treasury = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-frame-support-test = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+keyring = { package = "sp-keyring", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-trie = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-babe = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-application-crypto = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-staking-reward-curve = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-treasury = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+frame-support-test = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 serde_json = "1.0.61"
-sp-version = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sc-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-version = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sc-keystore = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 
 [features]
diff --git a/runtime/parachains/src/mock.rs b/runtime/parachains/src/mock.rs
index 642c99f8e1f3..fc45eed0d1a5 100644
--- a/runtime/parachains/src/mock.rs
+++ b/runtime/parachains/src/mock.rs
@@ -65,7 +65,7 @@ parameter_types! {
 pub type AccountId = u64;
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = BlockWeights;
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/runtime/parachains/src/ump.rs b/runtime/parachains/src/ump.rs
index c64123537b02..28096af46ae8 100644
--- a/runtime/parachains/src/ump.rs
+++ b/runtime/parachains/src/ump.rs
@@ -84,14 +84,18 @@ impl<XcmExecutor: xcm::v0::ExecuteXcm<C::Call>, C: Config> UmpSink for XcmSink<X
 		data: &[u8],
 		max_weight: Weight,
 	) -> Result<Weight, (MessageId, Weight)> {
+		use parity_scale_codec::DecodeLimit;
 		use xcm::{
 			v0::{Error as XcmError, Junction, MultiLocation, Xcm},
 			VersionedXcm,
 		};
 
 		let id = sp_io::hashing::blake2_256(&data[..]);
-		let maybe_msg =
-			VersionedXcm::<C::Call>::decode(&mut &data[..]).map(Xcm::<C::Call>::try_from);
+		let maybe_msg = VersionedXcm::<C::Call>::decode_all_with_depth_limit(
+			xcm::MAX_XCM_DECODE_DEPTH,
+			&mut &data[..],
+		)
+		.map(Xcm::<C::Call>::try_from);
 		match maybe_msg {
 			Err(_) => {
 				Pallet::<C>::deposit_event(Event::InvalidFormat(id));
diff --git a/runtime/polkadot/Cargo.toml b/runtime/polkadot/Cargo.toml
index 80d94f603356..9cc10eee8073 100644
--- a/runtime/polkadot/Cargo.toml
+++ b/runtime/polkadot/Cargo.toml
@@ -15,64 +15,64 @@ serde_derive = { version = "1.0.117", optional = true }
 static_assertions = "1.1.0"
 smallvec = "1.6.1"
 
-authority-discovery-primitives = { package = "sp-authority-discovery", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-babe-primitives = { package = "sp-consensus-babe", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-beefy-primitives = { git = "/~https://github.com/paritytech/grandpa-bridge-gadget", branch = "master", default-features = false }
-block-builder-api = { package = "sp-block-builder", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-inherents = { package = "sp-inherents", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-offchain-primitives = { package = "sp-offchain", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-tx-pool-api = { package = "sp-transaction-pool", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-staking = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-session = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-version = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-npos-elections = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+authority-discovery-primitives = { package = "sp-authority-discovery", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+babe-primitives = { package = "sp-consensus-babe", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+beefy-primitives = { git = "/~https://github.com/paritytech/grandpa-bridge-gadget", default-features = false , branch = "polkadot-v0.9.9" }
+block-builder-api = { package = "sp-block-builder", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+inherents = { package = "sp-inherents", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+offchain-primitives = { package = "sp-offchain", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+tx-pool-api = { package = "sp-transaction-pool", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-io = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-staking = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-session = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-version = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-npos-elections = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
-pallet-authority-discovery = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-authorship = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-babe = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-balances = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-bounties = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-transaction-payment-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-collective = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-democracy = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-elections-phragmen = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-election-provider-multi-phase = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-executive = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-identity = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-im-online = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-indices = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-membership = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-mmr-primitives = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-multisig = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-nicks = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-offences = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-proxy = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-scheduler = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-session = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-staking = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-staking-reward-curve = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-frame-system = {git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-system-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-timestamp = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-tips = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-treasury = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-vesting = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-utility = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-election-provider-support = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+pallet-authority-discovery = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-authorship = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-babe = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-balances = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-bounties = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-transaction-payment-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-collective = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-democracy = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-elections-phragmen = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-election-provider-multi-phase = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-executive = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-grandpa = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-identity = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-im-online = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-indices = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-membership = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-mmr-primitives = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-multisig = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-nicks = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-offences = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-proxy = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-scheduler = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-session = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-staking = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-staking-reward-curve = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+frame-system = {git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-system-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-timestamp = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-tips = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-treasury = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-vesting = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-utility = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-election-provider-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
-frame-benchmarking = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
-frame-try-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
-frame-system-benchmarking = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
-pallet-offences-benchmarking = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
-pallet-session-benchmarking = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
+frame-benchmarking = { git = "/~https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.9" }
+frame-try-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.9" }
+frame-system-benchmarking = { git = "/~https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.9" }
+pallet-offences-benchmarking = { git = "/~https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.9" }
+pallet-session-benchmarking = { git = "/~https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.9" }
 hex-literal = { version = "0.3.1", optional = true }
 
 runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
@@ -81,14 +81,14 @@ primitives = { package = "polkadot-primitives", path = "../../primitives", defau
 [dev-dependencies]
 hex-literal = "0.3.1"
 tiny-keccak = "2.0.2"
-keyring = { package = "sp-keyring", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-trie = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+keyring = { package = "sp-keyring", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-trie = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 trie-db = "0.22.3"
 serde_json = "1.0.61"
 separator = "0.4.1"
 
 [build-dependencies]
-substrate-wasm-builder = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+substrate-wasm-builder = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 [features]
 default = ["std"]
diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs
index 74149f03657d..79ad53180730 100644
--- a/runtime/polkadot/src/lib.rs
+++ b/runtime/polkadot/src/lib.rs
@@ -31,7 +31,7 @@ use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId;
 use beefy_primitives::crypto::AuthorityId as BeefyId;
 use frame_support::{
 	construct_runtime, parameter_types,
-	traits::{Filter, KeyOwnerProofSystem, LockIdentifier, OnRuntimeUpgrade},
+	traits::{Contains, KeyOwnerProofSystem, LockIdentifier, OnRuntimeUpgrade},
 	weights::Weight,
 	PalletId, RuntimeDebug,
 };
@@ -119,8 +119,8 @@ pub fn native_version() -> NativeVersion {
 }
 
 pub struct BaseFilter;
-impl Filter<Call> for BaseFilter {
-	fn filter(call: &Call) -> bool {
+impl Contains<Call> for BaseFilter {
+	fn contains(call: &Call) -> bool {
 		match call {
 			// These modules are all allowed to be called by transactions:
 			Call::Democracy(_) |
@@ -1124,7 +1124,7 @@ pub type Executive = frame_executive::Executive<
 	frame_system::ChainContext<Runtime>,
 	Runtime,
 	AllPallets,
-	(RemoveCollectiveFlip, MigratePalletVersionToStorageVersion),
+	MigratePalletVersionToStorageVersion,
 >;
 /// The payload being signed in transactions.
 pub type SignedPayload = generic::SignedPayload<Call, SignedExtra>;
@@ -1140,16 +1140,6 @@ impl OnRuntimeUpgrade for MigratePalletVersionToStorageVersion {
 	}
 }
 
-pub struct RemoveCollectiveFlip;
-impl frame_support::traits::OnRuntimeUpgrade for RemoveCollectiveFlip {
-	fn on_runtime_upgrade() -> Weight {
-		use frame_support::storage::migration;
-		// Remove the storage value `RandomMaterial` from removed pallet `RandomnessCollectiveFlip`
-		migration::remove_storage_prefix(b"RandomnessCollectiveFlip", b"RandomMaterial", b"");
-		<Runtime as frame_system::Config>::DbWeight::get().writes(1)
-	}
-}
-
 #[cfg(not(feature = "disable-runtime-api"))]
 sp_api::impl_runtime_apis! {
 	impl sp_api::Core<Block> for Runtime {
diff --git a/runtime/rococo/Cargo.toml b/runtime/rococo/Cargo.toml
index 84077d38d8da..b2502d20606e 100644
--- a/runtime/rococo/Cargo.toml
+++ b/runtime/rococo/Cargo.toml
@@ -13,51 +13,51 @@ smallvec = "1.6.1"
 hex-literal = "0.3.1"
 log = { version = "0.4.14", default-features = false }
 
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-std = { package = "sp-std", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-session = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-staking = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-version = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-io = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { package = "sp-std", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-session = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-staking = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-version = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
-tx-pool-api = { package = "sp-transaction-pool", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-block-builder-api = { package = "sp-block-builder", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-inherents = { package = "sp-inherents", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-offchain-primitives = { package = "sp-offchain", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+tx-pool-api = { package = "sp-transaction-pool", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+block-builder-api = { package = "sp-block-builder", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+inherents = { package = "sp-inherents", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+offchain-primitives = { package = "sp-offchain", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
-babe-primitives = { package = "sp-consensus-babe", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-beefy-primitives = { git = "/~https://github.com/paritytech/grandpa-bridge-gadget", branch = "master", default-features = false }
-frame-executive = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-authority-discovery = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-authorship = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-babe = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-beefy = { git = "/~https://github.com/paritytech/grandpa-bridge-gadget", branch = "master", default-features = false }
-pallet-beefy-mmr = { git = "/~https://github.com/paritytech/grandpa-bridge-gadget", branch = "master", default-features = false }
-pallet-balances = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-collective = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-im-online = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-indices = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-membership = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-mmr = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-mmr-primitives = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-transaction-payment-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-session = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-staking = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-sudo = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-timestamp = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-offences = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-proxy = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-utility = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-authority-discovery-primitives = { package = "sp-authority-discovery", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+babe-primitives = { package = "sp-consensus-babe", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+beefy-primitives = { git = "/~https://github.com/paritytech/grandpa-bridge-gadget", default-features = false , branch = "polkadot-v0.9.9" }
+frame-executive = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-authority-discovery = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-authorship = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-babe = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-beefy = { git = "/~https://github.com/paritytech/grandpa-bridge-gadget", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-beefy-mmr = { git = "/~https://github.com/paritytech/grandpa-bridge-gadget", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-balances = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-collective = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-grandpa = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-im-online = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-indices = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-membership = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-mmr = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-mmr-primitives = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-transaction-payment-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-session = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-staking = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-sudo = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-timestamp = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-offences = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-proxy = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-utility = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+authority-discovery-primitives = { package = "sp-authority-discovery", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
-frame-system = {git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-system-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+frame-system = {git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-system-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
 runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
 primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
@@ -80,7 +80,7 @@ pallet-bridge-grandpa = { path = "../../bridges/modules/grandpa", default-featur
 pallet-bridge-messages = { path = "../../bridges/modules/messages", default-features = false }
 
 [build-dependencies]
-substrate-wasm-builder = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+substrate-wasm-builder = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 [features]
 default = ["std"]
diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs
index aa6be8361030..c115080f3210 100644
--- a/runtime/rococo/src/lib.rs
+++ b/runtime/rococo/src/lib.rs
@@ -24,7 +24,7 @@ use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId;
 use beefy_primitives::{crypto::AuthorityId as BeefyId, mmr::MmrLeafVersion};
 use frame_support::{
 	construct_runtime, parameter_types,
-	traits::{All, Filter, IsInVec, KeyOwnerProofSystem, OnRuntimeUpgrade, Randomness},
+	traits::{Contains, Everything, IsInVec, KeyOwnerProofSystem, OnRuntimeUpgrade, Randomness},
 	weights::Weight,
 	PalletId,
 };
@@ -266,8 +266,8 @@ construct_runtime! {
 }
 
 pub struct BaseFilter;
-impl Filter<Call> for BaseFilter {
-	fn filter(_call: &Call) -> bool {
+impl Contains<Call> for BaseFilter {
+	fn contains(_call: &Call) -> bool {
 		true
 	}
 }
@@ -659,7 +659,7 @@ parameter_types! {
 use xcm_builder::{AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, TakeWeightCredit};
 pub type Barrier = (
 	TakeWeightCredit,
-	AllowTopLevelPaidExecutionFrom<All<MultiLocation>>,
+	AllowTopLevelPaidExecutionFrom<Everything>,
 	AllowUnpaidExecutionFrom<IsInVec<AllowUnpaidFrom>>, // <- Trusted parachains get free execution
 );
 
@@ -752,8 +752,8 @@ impl pallet_xcm::Config for Runtime {
 	// ...but they must match our filter, which requires them to be a simple withdraw + teleport.
 	type XcmExecuteFilter = OnlyWithdrawTeleportForAccounts;
 	type XcmExecutor = XcmExecutor<XcmConfig>;
-	type XcmTeleportFilter = All<(MultiLocation, Vec<MultiAsset>)>;
-	type XcmReserveTransferFilter = All<(MultiLocation, Vec<MultiAsset>)>;
+	type XcmTeleportFilter = Everything;
+	type XcmReserveTransferFilter = Everything;
 	type Weigher = FixedWeightBounds<BaseXcmWeight, Call>;
 	type LocationInverter = LocationInverter<Ancestry>;
 }
@@ -893,7 +893,7 @@ impl pallet_bridge_dispatch::Config<AtWococoFromRococoMessagesDispatch> for Runt
 	type Event = Event;
 	type MessageId = (bp_messages::LaneId, bp_messages::MessageNonce);
 	type Call = Call;
-	type CallFilter = frame_support::traits::AllowAll;
+	type CallFilter = frame_support::traits::Everything;
 	type EncodedCall = bridge_messages::FromRococoEncodedCall;
 	type SourceChainAccountId = bp_wococo::AccountId;
 	type TargetChainAccountPublic = sp_runtime::MultiSigner;
@@ -907,7 +907,7 @@ impl pallet_bridge_dispatch::Config<AtRococoFromWococoMessagesDispatch> for Runt
 	type Event = Event;
 	type MessageId = (bp_messages::LaneId, bp_messages::MessageNonce);
 	type Call = Call;
-	type CallFilter = frame_support::traits::AllowAll;
+	type CallFilter = frame_support::traits::Everything;
 	type EncodedCall = bridge_messages::FromWococoEncodedCall;
 	type SourceChainAccountId = bp_rococo::AccountId;
 	type TargetChainAccountPublic = sp_runtime::MultiSigner;
diff --git a/runtime/test-runtime/Cargo.toml b/runtime/test-runtime/Cargo.toml
index f16df24213e9..7c27df9540e9 100644
--- a/runtime/test-runtime/Cargo.toml
+++ b/runtime/test-runtime/Cargo.toml
@@ -14,64 +14,83 @@ serde = { version = "1.0.123", default-features = false }
 serde_derive = { version = "1.0.117", optional = true }
 smallvec = "1.6.1"
 
-authority-discovery-primitives = { package = "sp-authority-discovery", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-babe-primitives = { package = "sp-consensus-babe", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-beefy-primitives = { git = "/~https://github.com/paritytech/grandpa-bridge-gadget", branch = "master", default-features = false }
-sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-inherents = { package = "sp-inherents", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-offchain-primitives = { package = "sp-offchain", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-staking = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-session = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-version = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-election-provider-support = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-tx-pool-api = { package = "sp-transaction-pool", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-block-builder-api = { package = "sp-block-builder", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+authority-discovery-primitives = { package = "sp-authority-discovery", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+babe-primitives = { package = "sp-consensus-babe", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+beefy-primitives = { git = "/~https://github.com/paritytech/grandpa-bridge-gadget", default-features = false , branch = "polkadot-v0.9.9" }
+sp-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+inherents = { package = "sp-inherents", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+offchain-primitives = { package = "sp-offchain", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-io = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-staking = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-session = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-version = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-election-provider-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+tx-pool-api = { package = "sp-transaction-pool", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+block-builder-api = { package = "sp-block-builder", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
-pallet-authority-discovery = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-authorship = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-babe = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-balances = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-transaction-payment-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-executive = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-indices = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-mmr-primitives = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-nicks = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-offences = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-session = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-staking = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-staking-reward-curve = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-frame-system = {git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-system-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-timestamp = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-sudo = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-vesting = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+pallet-authority-discovery = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-authorship = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-babe = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-balances = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-transaction-payment-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-executive = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-grandpa = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-indices = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-mmr-primitives = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-nicks = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-offences = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-session = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-staking = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-staking-reward-curve = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+frame-system = {git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-system-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-timestamp = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-sudo = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-vesting = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
 runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
 primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
+pallet-xcm = { path = "../../xcm/pallet-xcm", default-features = false }
 polkadot-parachain = { path = "../../parachain", default-features = false }
 polkadot-runtime-parachains = { path = "../parachains", default-features = false }
+xcm-builder = { path = "../../xcm/xcm-builder", default-features = false }
+xcm-executor = { path = "../../xcm/xcm-executor", default-features = false }
+xcm = { path = "../../xcm", default-features = false }
 
 [dev-dependencies]
 hex-literal = "0.3.1"
 tiny-keccak = "2.0.2"
-keyring = { package = "sp-keyring", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-trie = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+keyring = { package = "sp-keyring", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-trie = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 serde_json = "1.0.61"
 
 [build-dependencies]
-substrate-wasm-builder = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+substrate-wasm-builder = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 [features]
 default = ["std"]
 no_std = []
 only-staking = []
+runtime-benchmarks = [
+	"runtime-common/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+	"pallet-babe/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
+	"pallet-grandpa/runtime-benchmarks",
+	"pallet-indices/runtime-benchmarks",
+	"pallet-staking/runtime-benchmarks",
+	"pallet-timestamp/runtime-benchmarks",
+	"pallet-xcm/runtime-benchmarks",
+	"xcm-builder/runtime-benchmarks",
+	"frame-election-provider-support/runtime-benchmarks",
+]
 std = [
 	"authority-discovery-primitives/std",
 	"pallet-authority-discovery/std",
@@ -82,6 +101,10 @@ std = [
 	"inherents/std",
 	"sp-core/std",
 	"polkadot-parachain/std",
+	"pallet-xcm/std",
+	"xcm-builder/std",
+	"xcm-executor/std",
+	"xcm/std",
 	"sp-api/std",
 	"tx-pool-api/std",
 	"block-builder-api/std",
diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs
index abc87e9af961..afa997393d78 100644
--- a/runtime/test-runtime/src/lib.rs
+++ b/runtime/test-runtime/src/lib.rs
@@ -79,6 +79,7 @@ pub use sp_runtime::BuildStorage;
 
 /// Constant values used within the runtime.
 pub mod constants;
+pub mod xcm_config;
 use constants::{currency::*, fee::*, time::*};
 
 // Make the WASM binary available.
@@ -122,7 +123,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Runtime {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = BlockWeights;
 	type BlockLength = BlockLength;
 	type DbWeight = ();
@@ -488,6 +489,28 @@ impl parachains_ump::Config for Runtime {
 	type FirstMessageFactorPercent = FirstMessageFactorPercent;
 }
 
+parameter_types! {
+	pub const BaseXcmWeight: frame_support::weights::Weight = 1_000;
+	pub const AnyNetwork: xcm::v0::NetworkId = xcm::v0::NetworkId::Any;
+}
+
+pub type LocalOriginToLocation = xcm_builder::SignedToAccountId32<Origin, AccountId, AnyNetwork>;
+
+impl pallet_xcm::Config for Runtime {
+	// The config types here are entirely configurable, since the only one that is sorely needed
+	// is `XcmExecutor`, which will be used in unit tests located in xcm-executor.
+	type Event = Event;
+	type ExecuteXcmOrigin = xcm_config::ConvertOriginToLocal;
+	type LocationInverter = xcm_config::InvertNothing;
+	type SendXcmOrigin = xcm_config::ConvertOriginToLocal;
+	type Weigher = xcm_builder::FixedWeightBounds<BaseXcmWeight, Call>;
+	type XcmRouter = xcm_config::DoNothingRouter;
+	type XcmExecuteFilter = frame_support::traits::Everything;
+	type XcmExecutor = xcm_executor::XcmExecutor<xcm_config::XcmConfig>;
+	type XcmTeleportFilter = frame_support::traits::Everything;
+	type XcmReserveTransferFilter = frame_support::traits::Everything;
+}
+
 impl parachains_hrmp::Config for Runtime {
 	type Event = Event;
 	type Origin = Origin;
@@ -543,6 +566,7 @@ construct_runtime! {
 		Hrmp: parachains_hrmp::{Pallet, Call, Storage, Event<T>},
 		Ump: parachains_ump::{Pallet, Call, Storage, Event},
 		Dmp: parachains_dmp::{Pallet, Call, Storage},
+		Xcm: pallet_xcm::{Pallet, Call, Event<T>, Origin},
 		ParasDisputes: parachains_disputes::{Pallet, Storage, Event<T>},
 
 		Sudo: pallet_sudo::{Pallet, Call, Storage, Config<T>, Event<T>},
diff --git a/runtime/test-runtime/src/xcm_config.rs b/runtime/test-runtime/src/xcm_config.rs
new file mode 100644
index 000000000000..c757d046c2b0
--- /dev/null
+++ b/runtime/test-runtime/src/xcm_config.rs
@@ -0,0 +1,93 @@
+// Copyright 2021 Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+
+use frame_support::{
+	traits::{EnsureOrigin, Everything, OriginTrait},
+	weights::Weight,
+};
+use xcm::v0::{Error as XcmError, MultiAsset, MultiLocation, Result as XcmResult, SendXcm, Xcm};
+use xcm_builder::{AllowUnpaidExecutionFrom, FixedWeightBounds};
+use xcm_executor::{
+	traits::{InvertLocation, TransactAsset, WeightTrader},
+	Assets,
+};
+
+pub struct ConvertOriginToLocal;
+impl<Origin: OriginTrait> EnsureOrigin<Origin> for ConvertOriginToLocal {
+	type Success = MultiLocation;
+
+	fn try_origin(_: Origin) -> Result<MultiLocation, Origin> {
+		Ok(MultiLocation::Null)
+	}
+
+	#[cfg(feature = "runtime-benchmarks")]
+	fn successful_origin() -> Origin {
+		Origin::root()
+	}
+}
+
+pub struct DoNothingRouter;
+impl SendXcm for DoNothingRouter {
+	fn send_xcm(_dest: MultiLocation, _msg: Xcm<()>) -> XcmResult {
+		Ok(())
+	}
+}
+
+pub type Barrier = AllowUnpaidExecutionFrom<Everything>;
+
+pub struct DummyAssetTransactor;
+impl TransactAsset for DummyAssetTransactor {
+	fn deposit_asset(_what: &MultiAsset, _who: &MultiLocation) -> XcmResult {
+		Ok(())
+	}
+
+	fn withdraw_asset(_what: &MultiAsset, _who: &MultiLocation) -> Result<Assets, XcmError> {
+		Ok(Assets::default())
+	}
+}
+
+pub struct DummyWeightTrader;
+impl WeightTrader for DummyWeightTrader {
+	fn new() -> Self {
+		DummyWeightTrader
+	}
+
+	fn buy_weight(&mut self, _weight: Weight, _payment: Assets) -> Result<Assets, XcmError> {
+		Ok(Assets::default())
+	}
+}
+
+pub struct InvertNothing;
+impl InvertLocation for InvertNothing {
+	fn invert_location(_: &MultiLocation) -> MultiLocation {
+		MultiLocation::Null
+	}
+}
+
+pub struct XcmConfig;
+impl xcm_executor::Config for XcmConfig {
+	type Call = super::Call;
+	type XcmSender = DoNothingRouter;
+	type AssetTransactor = DummyAssetTransactor;
+	type OriginConverter = pallet_xcm::XcmPassthrough<super::Origin>;
+	type IsReserve = ();
+	type IsTeleporter = ();
+	type LocationInverter = InvertNothing;
+	type Barrier = Barrier;
+	type Weigher = FixedWeightBounds<super::BaseXcmWeight, super::Call>;
+	type Trader = DummyWeightTrader;
+	type ResponseHandler = ();
+}
diff --git a/runtime/westend/Cargo.toml b/runtime/westend/Cargo.toml
index d1cff730e909..8ee8bfeadf7a 100644
--- a/runtime/westend/Cargo.toml
+++ b/runtime/westend/Cargo.toml
@@ -15,66 +15,66 @@ serde_derive = { version = "1.0.117", optional = true }
 smallvec = "1.6.1"
 static_assertions = "1.1.0"
 
-authority-discovery-primitives = { package = "sp-authority-discovery", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-babe-primitives = { package = "sp-consensus-babe", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-beefy-primitives = { git = "/~https://github.com/paritytech/grandpa-bridge-gadget", branch = "master", default-features = false }
-inherents = { package = "sp-inherents", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-offchain-primitives = { package = "sp-offchain", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-api = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-std = { package = "sp-std", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-staking = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-session = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-version = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-tx-pool-api = { package = "sp-transaction-pool", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-block-builder-api = { package = "sp-block-builder", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-npos-elections = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+authority-discovery-primitives = { package = "sp-authority-discovery", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+babe-primitives = { package = "sp-consensus-babe", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+beefy-primitives = { git = "/~https://github.com/paritytech/grandpa-bridge-gadget", default-features = false , branch = "polkadot-v0.9.9" }
+inherents = { package = "sp-inherents", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+offchain-primitives = { package = "sp-offchain", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { package = "sp-std", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-io = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-staking = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-session = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-version = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+tx-pool-api = { package = "sp-transaction-pool", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+block-builder-api = { package = "sp-block-builder", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-npos-elections = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
-frame-election-provider-support = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-executive = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-system = {git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-system-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-authority-discovery = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-authorship = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-babe = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-balances = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-collective = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-democracy = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-elections-phragmen = { package = "pallet-elections-phragmen", git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-election-provider-multi-phase = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-grandpa = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-identity = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-im-online = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-indices = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-membership = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-mmr-primitives = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-multisig = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-nicks = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-offences = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-proxy = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-recovery = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-scheduler = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-session = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-society = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-staking = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-sudo = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-timestamp = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-transaction-payment-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-treasury = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-utility = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-vesting = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+frame-election-provider-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-executive = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-system = {git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-system-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-authority-discovery = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-authorship = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-babe = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-balances = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-collective = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-democracy = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-elections-phragmen = { package = "pallet-elections-phragmen", git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-election-provider-multi-phase = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-grandpa = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-identity = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-im-online = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-indices = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-membership = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-mmr-primitives = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-multisig = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-nicks = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-offences = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-proxy = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-recovery = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-scheduler = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-session = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-society = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-staking = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-sudo = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-timestamp = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-transaction-payment-rpc-runtime-api = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-treasury = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-utility = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-vesting = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 pallet-xcm = { path = "../../xcm/pallet-xcm", default-features = false }
 
-frame-benchmarking = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
-frame-try-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
-frame-system-benchmarking = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
-pallet-offences-benchmarking = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
-pallet-session-benchmarking = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
+frame-benchmarking = { git = "/~https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.9" }
+frame-try-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.9" }
+frame-system-benchmarking = { git = "/~https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.9" }
+pallet-offences-benchmarking = { git = "/~https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.9" }
+pallet-session-benchmarking = { git = "/~https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.9" }
 hex-literal = { version = "0.3.1", optional = true }
 
 runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
@@ -89,12 +89,12 @@ xcm-builder = { package = "xcm-builder", path = "../../xcm/xcm-builder", default
 [dev-dependencies]
 hex-literal = "0.3.1"
 tiny-keccak = "2.0.2"
-keyring = { package = "sp-keyring", git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-trie = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+keyring = { package = "sp-keyring", git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-trie = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 serde_json = "1.0.61"
 
 [build-dependencies]
-substrate-wasm-builder = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+substrate-wasm-builder = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 [features]
 default = ["std"]
diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs
index cdfc47da27fd..823a0d843271 100644
--- a/runtime/westend/src/lib.rs
+++ b/runtime/westend/src/lib.rs
@@ -63,7 +63,7 @@ use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId;
 use beefy_primitives::crypto::AuthorityId as BeefyId;
 use frame_support::{
 	construct_runtime, parameter_types,
-	traits::{All, Filter, InstanceFilter, KeyOwnerProofSystem, OnRuntimeUpgrade},
+	traits::{Contains, Everything, InstanceFilter, KeyOwnerProofSystem, OnRuntimeUpgrade},
 	weights::Weight,
 	PalletId, RuntimeDebug,
 };
@@ -141,8 +141,8 @@ pub fn native_version() -> NativeVersion {
 
 /// Allow everything.
 pub struct BaseFilter;
-impl Filter<Call> for BaseFilter {
-	fn filter(_: &Call) -> bool {
+impl Contains<Call> for BaseFilter {
+	fn contains(_: &Call) -> bool {
 		true
 	}
 }
@@ -922,7 +922,7 @@ pub type Barrier = (
 	// Weight that is paid for may be consumed.
 	TakeWeightCredit,
 	// If the message is one that immediately attemps to pay for execution, then allow it.
-	AllowTopLevelPaidExecutionFrom<All<MultiLocation>>,
+	AllowTopLevelPaidExecutionFrom<Everything>,
 	// Messages coming from system parachains need not pay for execution.
 	AllowUnpaidExecutionFrom<IsChildSystemParachain<ParaId>>,
 );
@@ -1009,8 +1009,8 @@ impl pallet_xcm::Config for Runtime {
 	// ...but they must match our filter, which requires them to be a simple withdraw + teleport.
 	type XcmExecuteFilter = OnlyWithdrawTeleportForAccounts;
 	type XcmExecutor = XcmExecutor<XcmConfig>;
-	type XcmTeleportFilter = All<(MultiLocation, Vec<MultiAsset>)>;
-	type XcmReserveTransferFilter = All<(MultiLocation, Vec<MultiAsset>)>;
+	type XcmTeleportFilter = Everything;
+	type XcmReserveTransferFilter = Everything;
 	type Weigher = FixedWeightBounds<BaseXcmWeight, Call>;
 	type LocationInverter = LocationInverter<Ancestry>;
 }
@@ -1124,7 +1124,7 @@ pub type Executive = frame_executive::Executive<
 	frame_system::ChainContext<Runtime>,
 	Runtime,
 	AllPallets,
-	(RemoveCollectiveFlip, MigratePalletVersionToStorageVersion),
+	MigratePalletVersionToStorageVersion,
 >;
 /// The payload being signed in transactions.
 pub type SignedPayload = generic::SignedPayload<Call, SignedExtra>;
@@ -1140,16 +1140,6 @@ impl OnRuntimeUpgrade for MigratePalletVersionToStorageVersion {
 	}
 }
 
-pub struct RemoveCollectiveFlip;
-impl frame_support::traits::OnRuntimeUpgrade for RemoveCollectiveFlip {
-	fn on_runtime_upgrade() -> Weight {
-		use frame_support::storage::migration;
-		// Remove the storage value `RandomMaterial` from removed pallet `RandomnessCollectiveFlip`
-		migration::remove_storage_prefix(b"RandomnessCollectiveFlip", b"RandomMaterial", b"");
-		<Runtime as frame_system::Config>::DbWeight::get().writes(1)
-	}
-}
-
 #[cfg(not(feature = "disable-runtime-api"))]
 sp_api::impl_runtime_apis! {
 	impl sp_api::Core<Block> for Runtime {
diff --git a/statement-table/Cargo.toml b/statement-table/Cargo.toml
index 4c94017dea6d..f1aa979e8560 100644
--- a/statement-table/Cargo.toml
+++ b/statement-table/Cargo.toml
@@ -6,5 +6,5 @@ edition = "2018"
 
 [dependencies]
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 primitives = { package = "polkadot-primitives", path = "../primitives" }
diff --git a/utils/staking-miner/Cargo.toml b/utils/staking-miner/Cargo.toml
index 7c64fe68c3f9..92b6d039c5b6 100644
--- a/utils/staking-miner/Cargo.toml
+++ b/utils/staking-miner/Cargo.toml
@@ -13,26 +13,26 @@ structopt = "0.3.0"
 jsonrpsee-ws-client = { version = "0.3.0", default-features = false, features = ["tokio02"] }
 serde_json = "1.0"
 serde = "1.0.0"
-hex = "0.4.0"
+hex = "0.4.3"
 lazy_static = "1.4.0"
 paste = "1.0.5"
-thiserror = "1.0.0"
+thiserror = "1.0.26"
 
-remote-externalities = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+remote-externalities = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-npos-elections = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sc-transaction-pool-api = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-npos-elections = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-transaction-pool-api = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 
-frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-frame-election-provider-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-election-provider-multi-phase = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-staking = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+frame-election-provider-support = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-election-provider-multi-phase = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-staking = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 core-primitives = { package = "polkadot-core-primitives", path = "../../core-primitives" }
 
@@ -42,4 +42,4 @@ kusama-runtime = { path = "../../runtime/kusama" }
 westend-runtime = { path = "../../runtime/westend" }
 
 [dev-dependencies]
-sp-version = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+sp-version = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
diff --git a/utils/staking-miner/src/main.rs b/utils/staking-miner/src/main.rs
index a1b04f770ccc..ba804118327a 100644
--- a/utils/staking-miner/src/main.rs
+++ b/utils/staking-miner/src/main.rs
@@ -78,7 +78,7 @@ macro_rules! construct_runtime_prelude {
 
 					let crate::signer::Signer { account, pair, .. } = signer;
 
-					let local_call = EPMCall::<Runtime>::submit(raw_solution, witness);
+					let local_call = EPMCall::<Runtime>::submit(Box::new(raw_solution), witness);
 					let call: Call = <EPMCall<Runtime> as std::convert::TryInto<Call>>::try_into(local_call)
 						.expect("election provider pallet must exist in the runtime, thus \
 							inner call can be converted, qed."
diff --git a/xcm/pallet-xcm/Cargo.toml b/xcm/pallet-xcm/Cargo.toml
index 821608e62e72..d80b1c52581f 100644
--- a/xcm/pallet-xcm/Cargo.toml
+++ b/xcm/pallet-xcm/Cargo.toml
@@ -9,19 +9,19 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 log = { version = "0.4.14", default-features = false }
 
-sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-system = { git = "/~https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-system = { git = "/~https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
 
 xcm = { path = "..", default-features = false }
 xcm-executor = { path = "../xcm-executor", default-features = false }
 
 [dev-dependencies]
-pallet-balances = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+pallet-balances = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 polkadot-runtime-parachains = { path = "../../runtime/parachains" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-io = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 xcm-builder = { path = "../xcm-builder" }
 polkadot-parachain = { path = "../../parachain" }
 
diff --git a/xcm/pallet-xcm/src/lib.rs b/xcm/pallet-xcm/src/lib.rs
index 8187171bf86e..03dc618229ff 100644
--- a/xcm/pallet-xcm/src/lib.rs
+++ b/xcm/pallet-xcm/src/lib.rs
@@ -23,7 +23,7 @@ mod mock;
 #[cfg(test)]
 mod tests;
 
-use frame_support::traits::{Contains, EnsureOrigin, Filter, Get, OriginTrait};
+use frame_support::traits::{Contains, EnsureOrigin, Get, OriginTrait};
 use sp_runtime::{traits::BadOrigin, RuntimeDebug};
 use sp_std::{boxed::Box, convert::TryInto, marker::PhantomData, prelude::*, vec};
 use xcm::v0::prelude::*;
@@ -331,10 +331,10 @@ where
 ///
 /// May reasonably be used with `EnsureXcm`.
 pub struct IsMajorityOfBody<Prefix, Body>(PhantomData<(Prefix, Body)>);
-impl<Prefix: Get<MultiLocation>, Body: Get<BodyId>> Filter<MultiLocation>
+impl<Prefix: Get<MultiLocation>, Body: Get<BodyId>> Contains<MultiLocation>
 	for IsMajorityOfBody<Prefix, Body>
 {
-	fn filter(l: &MultiLocation) -> bool {
+	fn contains(l: &MultiLocation) -> bool {
 		let maybe_suffix = l.match_and_split(&Prefix::get());
 		matches!(maybe_suffix, Some(Plurality { id, part }) if id == &Body::get() && part.is_majority())
 	}
@@ -343,7 +343,7 @@ impl<Prefix: Get<MultiLocation>, Body: Get<BodyId>> Filter<MultiLocation>
 /// `EnsureOrigin` implementation succeeding with a `MultiLocation` value to recognize and filter the
 /// `Origin::Xcm` item.
 pub struct EnsureXcm<F>(PhantomData<F>);
-impl<O: OriginTrait + From<Origin>, F: Filter<MultiLocation>> EnsureOrigin<O> for EnsureXcm<F>
+impl<O: OriginTrait + From<Origin>, F: Contains<MultiLocation>> EnsureOrigin<O> for EnsureXcm<F>
 where
 	O::PalletsOrigin: From<Origin> + TryInto<Origin, Error = O::PalletsOrigin>,
 {
@@ -352,7 +352,7 @@ where
 	fn try_origin(outer: O) -> Result<Self::Success, O> {
 		outer.try_with_caller(|caller| {
 			caller.try_into().and_then(|Origin::Xcm(location)| {
-				if F::filter(&location) {
+				if F::contains(&location) {
 					Ok(location)
 				} else {
 					Err(Origin::Xcm(location).into())
diff --git a/xcm/pallet-xcm/src/mock.rs b/xcm/pallet-xcm/src/mock.rs
index 4689b256bc07..62b7fbf403b8 100644
--- a/xcm/pallet-xcm/src/mock.rs
+++ b/xcm/pallet-xcm/src/mock.rs
@@ -14,11 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-use frame_support::{
-	construct_runtime, parameter_types,
-	traits::{All, AllowAll},
-	weights::Weight,
-};
+use frame_support::{construct_runtime, parameter_types, traits::Everything, weights::Weight};
 use polkadot_parachain::primitives::Id as ParaId;
 use polkadot_runtime_parachains::origin;
 use sp_core::H256;
@@ -108,7 +104,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type DbWeight = ();
-	type BaseCallFilter = AllowAll;
+	type BaseCallFilter = Everything;
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
 	type OnSetCode = ();
@@ -157,7 +153,7 @@ parameter_types! {
 	pub CurrencyPerSecond: (MultiLocation, u128) = (RelayLocation::get(), 1);
 }
 
-pub type Barrier = (TakeWeightCredit, AllowTopLevelPaidExecutionFrom<All<MultiLocation>>);
+pub type Barrier = (TakeWeightCredit, AllowTopLevelPaidExecutionFrom<Everything>);
 
 pub struct XcmConfig;
 impl xcm_executor::Config for XcmConfig {
@@ -181,10 +177,10 @@ impl pallet_xcm::Config for Test {
 	type SendXcmOrigin = xcm_builder::EnsureXcmOrigin<Origin, LocalOriginToLocation>;
 	type XcmRouter = (TestSendXcmErrX8, TestSendXcm);
 	type ExecuteXcmOrigin = xcm_builder::EnsureXcmOrigin<Origin, LocalOriginToLocation>;
-	type XcmExecuteFilter = All<(MultiLocation, xcm::v0::Xcm<Call>)>;
+	type XcmExecuteFilter = Everything;
 	type XcmExecutor = XcmExecutor<XcmConfig>;
-	type XcmTeleportFilter = All<(MultiLocation, Vec<MultiAsset>)>;
-	type XcmReserveTransferFilter = All<(MultiLocation, Vec<MultiAsset>)>;
+	type XcmTeleportFilter = Everything;
+	type XcmReserveTransferFilter = Everything;
 	type Weigher = FixedWeightBounds<BaseXcmWeight, Call>;
 	type LocationInverter = LocationInverter<Ancestry>;
 }
diff --git a/xcm/src/double_encoded.rs b/xcm/src/double_encoded.rs
index 70592580d3c4..ae21336d13c3 100644
--- a/xcm/src/double_encoded.rs
+++ b/xcm/src/double_encoded.rs
@@ -14,12 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
+use crate::MAX_XCM_DECODE_DEPTH;
 use alloc::vec::Vec;
 use parity_scale_codec::{Decode, DecodeLimit, Encode};
 
-/// Maximum nesting level for XCM decoding.
-pub const MAX_XCM_DECODE_DEPTH: u32 = 8;
-
 /// Wrapper around the encoded and decoded versions of a value.
 /// Caches the decoded value once computed.
 #[derive(Encode, Decode)]
diff --git a/xcm/src/lib.rs b/xcm/src/lib.rs
index b51b1b985148..052ac66c2be8 100644
--- a/xcm/src/lib.rs
+++ b/xcm/src/lib.rs
@@ -31,6 +31,9 @@ pub mod v0;
 mod double_encoded;
 pub use double_encoded::DoubleEncoded;
 
+/// Maximum nesting level for XCM decoding.
+pub const MAX_XCM_DECODE_DEPTH: u32 = 8;
+
 /// A single XCM message, together with its version code.
 #[derive(Derivative, Encode, Decode)]
 #[derivative(Clone(bound = ""), Eq(bound = ""), PartialEq(bound = ""), Debug(bound = ""))]
diff --git a/xcm/src/v0/traits.rs b/xcm/src/v0/traits.rs
index e1673fd5d990..58f395716f8a 100644
--- a/xcm/src/v0/traits.rs
+++ b/xcm/src/v0/traits.rs
@@ -87,6 +87,8 @@ pub enum Error {
 	TooExpensive,
 	/// The given asset is not handled.
 	AssetNotFound,
+	/// `execute_xcm` has been called too many times recursively.
+	RecursionLimitReached,
 }
 
 impl From<()> for Error {
diff --git a/xcm/xcm-builder/Cargo.toml b/xcm/xcm-builder/Cargo.toml
index d6f8a5ce08cf..aebdec93b816 100644
--- a/xcm/xcm-builder/Cargo.toml
+++ b/xcm/xcm-builder/Cargo.toml
@@ -10,13 +10,13 @@ impl-trait-for-tuples = "0.2.0"
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
 xcm = { path = "..", default-features = false }
 xcm-executor = { path = "../xcm-executor", default-features = false }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-arithmetic = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-arithmetic = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-io = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-system = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+pallet-transaction-payment = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 
 # Polkadot dependencies
 polkadot-parachain = { path = "../../parachain", default-features = false }
diff --git a/xcm/xcm-executor/Cargo.toml b/xcm/xcm-executor/Cargo.toml
index d0b6d71d8fe7..1dd8af4f98ff 100644
--- a/xcm/xcm-executor/Cargo.toml
+++ b/xcm/xcm-executor/Cargo.toml
@@ -9,12 +9,12 @@ version = "0.9.9"
 impl-trait-for-tuples = "0.2.0"
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
 xcm = { path = "..", default-features = false }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-arithmetic = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-std = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-io = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-arithmetic = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
 log = { version = "0.4.14", default-features = false }
 
 [features]
diff --git a/xcm/xcm-executor/integration-tests/Cargo.toml b/xcm/xcm-executor/integration-tests/Cargo.toml
new file mode 100644
index 000000000000..0b5a68c8d565
--- /dev/null
+++ b/xcm/xcm-executor/integration-tests/Cargo.toml
@@ -0,0 +1,30 @@
+[package]
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+name = "xcm-executor-integration-tests"
+description = "Integration tests for the XCM Executor"
+version = "0.9.9"
+
+[dependencies]
+frame-support = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+futures = "0.3.15"
+pallet-xcm = { path = "../../pallet-xcm" }
+polkadot-test-client = { path = "../../../node/test/client" }
+polkadot-test-runtime = { path = "../../../runtime/test-runtime", features = ["runtime-benchmarks"] }
+polkadot-test-service = { path = "../../../node/test/service" }
+sp-consensus = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keyring = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.9" }
+sp-state-machine = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+xcm = { path = "../..", default-features = false }
+xcm-executor = { path = ".." }
+sp-tracing = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+
+[features]
+default = ["std"]
+std = [
+	"xcm/std",
+	"sp-runtime/std",
+	"frame-support/std",
+]
diff --git a/xcm/xcm-executor/integration-tests/src/lib.rs b/xcm/xcm-executor/integration-tests/src/lib.rs
new file mode 100644
index 000000000000..0c380ddcebd0
--- /dev/null
+++ b/xcm/xcm-executor/integration-tests/src/lib.rs
@@ -0,0 +1,139 @@
+// Copyright 2021 Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+
+#![cfg_attr(not(feature = "std"), no_std)]
+#![cfg(test)]
+
+use polkadot_test_client::{
+	BlockBuilderExt, ClientBlockImportExt, DefaultTestClientBuilderExt, ExecutionStrategy,
+	InitPolkadotBlockBuilder, TestClientBuilder, TestClientBuilderExt,
+};
+use polkadot_test_service::construct_extrinsic;
+use sp_runtime::{generic::BlockId, traits::Block};
+use sp_state_machine::InspectState;
+use xcm::v0::{Error as XcmError, MultiAsset::*, MultiLocation::*, Order, Outcome, Xcm::*};
+use xcm_executor::MAX_RECURSION_LIMIT;
+
+// This is the inflection point where the test should either fail or pass.
+const MAX_RECURSION_CHECK: u32 = MAX_RECURSION_LIMIT / 2;
+
+#[test]
+fn execute_within_recursion_limit() {
+	sp_tracing::try_init_simple();
+	let mut client = TestClientBuilder::new()
+		.set_execution_strategy(ExecutionStrategy::AlwaysWasm)
+		.build();
+
+	let mut msg =
+		WithdrawAsset { assets: vec![ConcreteFungible { id: Null, amount: 0 }], effects: vec![] };
+	for _ in 0..MAX_RECURSION_CHECK {
+		msg = WithdrawAsset {
+			assets: vec![ConcreteFungible { id: Null, amount: 0 }],
+			effects: vec![Order::BuyExecution {
+				fees: All,
+				weight: 0,
+				debt: 0,
+				halt_on_error: true,
+				// nest `msg` into itself on each iteration.
+				xcm: vec![msg],
+			}],
+		};
+	}
+
+	let execute = construct_extrinsic(
+		&client,
+		polkadot_test_runtime::Call::Xcm(pallet_xcm::Call::execute(
+			Box::new(msg.clone()),
+			1_000_000_000,
+		)),
+		sp_keyring::Sr25519Keyring::Alice,
+	);
+
+	let mut block_builder = client.init_polkadot_block_builder();
+	block_builder.push_polkadot_extrinsic(execute).expect("pushes extrinsic");
+
+	let block = block_builder.build().expect("Finalizes the block").block;
+	let block_hash = block.hash();
+
+	futures::executor::block_on(client.import(sp_consensus::BlockOrigin::Own, block))
+		.expect("imports the block");
+
+	client
+		.state_at(&BlockId::Hash(block_hash))
+		.expect("state should exist")
+		.inspect_state(|| {
+			assert!(polkadot_test_runtime::System::events().iter().any(|r| matches!(
+				r.event,
+				polkadot_test_runtime::Event::Xcm(pallet_xcm::Event::Attempted(Outcome::Complete(
+					_
+				)),),
+			)));
+		});
+}
+
+#[test]
+fn exceed_recursion_limit() {
+	sp_tracing::try_init_simple();
+	let mut client = TestClientBuilder::new()
+		.set_execution_strategy(ExecutionStrategy::AlwaysWasm)
+		.build();
+
+	let mut msg =
+		WithdrawAsset { assets: vec![ConcreteFungible { id: Null, amount: 0 }], effects: vec![] };
+	for _ in 0..(MAX_RECURSION_CHECK + 1) {
+		msg = WithdrawAsset {
+			assets: vec![ConcreteFungible { id: Null, amount: 0 }],
+			effects: vec![Order::BuyExecution {
+				fees: All,
+				weight: 0,
+				debt: 0,
+				halt_on_error: true,
+				// nest `msg` into itself on each iteration.
+				xcm: vec![msg],
+			}],
+		};
+	}
+
+	let execute = construct_extrinsic(
+		&client,
+		polkadot_test_runtime::Call::Xcm(pallet_xcm::Call::execute(
+			Box::new(msg.clone()),
+			1_000_000_000,
+		)),
+		sp_keyring::Sr25519Keyring::Alice,
+	);
+
+	let mut block_builder = client.init_polkadot_block_builder();
+	block_builder.push_polkadot_extrinsic(execute).expect("pushes extrinsic");
+
+	let block = block_builder.build().expect("Finalizes the block").block;
+	let block_hash = block.hash();
+
+	futures::executor::block_on(client.import(sp_consensus::BlockOrigin::Own, block))
+		.expect("imports the block");
+
+	client
+		.state_at(&BlockId::Hash(block_hash))
+		.expect("state should exist")
+		.inspect_state(|| {
+			assert!(polkadot_test_runtime::System::events().iter().any(|r| matches!(
+				r.event,
+				polkadot_test_runtime::Event::Xcm(pallet_xcm::Event::Attempted(
+					Outcome::Incomplete(_, XcmError::RecursionLimitReached),
+				)),
+			)));
+		});
+}
diff --git a/xcm/xcm-executor/src/lib.rs b/xcm/xcm-executor/src/lib.rs
index bb0b8eb604a8..5ed61e4676bc 100644
--- a/xcm/xcm-executor/src/lib.rs
+++ b/xcm/xcm-executor/src/lib.rs
@@ -41,6 +41,9 @@ pub use config::Config;
 /// The XCM executor.
 pub struct XcmExecutor<Config>(PhantomData<Config>);
 
+/// The maximum recursion limit for `execute_xcm` and `execute_effects`.
+pub const MAX_RECURSION_LIMIT: u32 = 8;
+
 impl<Config: config::Config> ExecuteXcm<Config::Call> for XcmExecutor<Config> {
 	fn execute_xcm_in_credit(
 		origin: MultiLocation,
@@ -56,7 +59,6 @@ impl<Config: config::Config> ExecuteXcm<Config::Call> for XcmExecutor<Config> {
 			weight_limit,
 			weight_credit,
 		);
-		// TODO: #2841 #HARDENXCM We should identify recursive bombs here and bail.
 		let mut message = Xcm::<Config::Call>::from(message);
 		let shallow_weight = match Config::Weigher::shallow(&mut message) {
 			Ok(x) => x,
@@ -81,6 +83,7 @@ impl<Config: config::Config> ExecuteXcm<Config::Call> for XcmExecutor<Config> {
 			&mut weight_credit,
 			Some(shallow_weight),
 			&mut trader,
+			0,
 		);
 		drop(trader);
 		log::trace!(target: "xcm::execute_xcm", "result: {:?}", &result);
@@ -110,16 +113,23 @@ impl<Config: config::Config> XcmExecutor<Config> {
 		weight_credit: &mut Weight,
 		maybe_shallow_weight: Option<Weight>,
 		trader: &mut Config::Trader,
+		num_recursions: u32,
 	) -> Result<Weight, XcmError> {
 		log::trace!(
 			target: "xcm::do_execute_xcm",
-			"origin: {:?}, top_level: {:?}, message: {:?}, weight_credit: {:?}, maybe_shallow_weight: {:?}",
+			"origin: {:?}, top_level: {:?}, message: {:?}, weight_credit: {:?}, maybe_shallow_weight: {:?}, recursion: {:?}",
 			origin,
 			top_level,
 			message,
 			weight_credit,
 			maybe_shallow_weight,
+			num_recursions,
 		);
+
+		if num_recursions > MAX_RECURSION_LIMIT {
+			return Err(XcmError::RecursionLimitReached)
+		}
+
 		// This is the weight of everything that cannot be paid for. This basically means all computation
 		// except any XCM which is behind an Order::BuyExecution.
 		let shallow_weight = maybe_shallow_weight
@@ -242,8 +252,15 @@ impl<Config: config::Config> XcmExecutor<Config> {
 				ensure!(who.is_interior(), XcmError::EscalationOfPrivilege);
 				let mut origin = origin;
 				origin.append_with(who).map_err(|_| XcmError::MultiLocationFull)?;
-				let surplus =
-					Self::do_execute_xcm(origin, top_level, *message, weight_credit, None, trader)?;
+				let surplus = Self::do_execute_xcm(
+					origin,
+					top_level,
+					*message,
+					weight_credit,
+					None,
+					trader,
+					num_recursions + 1,
+				)?;
 				total_surplus = total_surplus.saturating_add(surplus);
 				None
 			},
@@ -251,8 +268,14 @@ impl<Config: config::Config> XcmExecutor<Config> {
 		};
 
 		if let Some((mut holding, effects)) = maybe_holding_effects {
-			for effect in effects.into_iter() {
-				total_surplus += Self::execute_effects(&origin, &mut holding, effect, trader)?;
+			for effect in effects {
+				total_surplus += Self::execute_effects(
+					&origin,
+					&mut holding,
+					effect,
+					trader,
+					num_recursions + 1,
+				)?;
 			}
 		}
 
@@ -264,14 +287,21 @@ impl<Config: config::Config> XcmExecutor<Config> {
 		holding: &mut Assets,
 		effect: Order<Config::Call>,
 		trader: &mut Config::Trader,
+		num_recursions: u32,
 	) -> Result<Weight, XcmError> {
 		log::trace!(
 			target: "xcm::execute_effects",
-			"origin: {:?}, holding: {:?}, effect: {:?}",
+			"origin: {:?}, holding: {:?}, effect: {:?}, recursion: {:?}",
 			origin,
 			holding,
 			effect,
+			num_recursions,
 		);
+
+		if num_recursions > MAX_RECURSION_LIMIT {
+			return Err(XcmError::RecursionLimitReached)
+		}
+
 		let mut total_surplus = 0;
 		match effect {
 			Order::DepositAsset { assets, dest } => {
@@ -317,7 +347,7 @@ impl<Config: config::Config> XcmExecutor<Config> {
 				holding.saturating_subsume_all(unspent);
 
 				let mut remaining_weight = weight;
-				for message in xcm.into_iter() {
+				for message in xcm {
 					match Self::do_execute_xcm(
 						origin.clone(),
 						false,
@@ -325,6 +355,7 @@ impl<Config: config::Config> XcmExecutor<Config> {
 						&mut remaining_weight,
 						None,
 						trader,
+						num_recursions + 1,
 					) {
 						Err(e) if halt_on_error => return Err(e),
 						Err(_) => {},
diff --git a/xcm/xcm-simulator/Cargo.toml b/xcm/xcm-simulator/Cargo.toml
index c0219386b823..fb28b7269a19 100644
--- a/xcm/xcm-simulator/Cargo.toml
+++ b/xcm/xcm-simulator/Cargo.toml
@@ -9,9 +9,9 @@ edition = "2018"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 paste = "1.0.5"
 
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 xcm = { path = "../" }
 xcm-executor = { path = "../xcm-executor" }
diff --git a/xcm/xcm-simulator/example/Cargo.toml b/xcm/xcm-simulator/example/Cargo.toml
index 77b8b8e3690a..059aba0d5f74 100644
--- a/xcm/xcm-simulator/example/Cargo.toml
+++ b/xcm/xcm-simulator/example/Cargo.toml
@@ -9,13 +9,13 @@ edition = "2018"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 paste = "1.0.5"
 
-frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-pallet-balances = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
-sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "master" }
+frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-balances = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 xcm = { path = "../../" }
 xcm-simulator = { path = "../" }
@@ -24,4 +24,4 @@ xcm-builder = { path = "../../xcm-builder" }
 pallet-xcm = { path = "../../pallet-xcm" }
 polkadot-core-primitives = { path = "../../../core-primitives"}
 polkadot-runtime-parachains = { path = "../../../runtime/parachains" }
-polkadot-parachain = { path = "../../../parachain" }
\ No newline at end of file
+polkadot-parachain = { path = "../../../parachain" }
diff --git a/xcm/xcm-simulator/example/src/parachain.rs b/xcm/xcm-simulator/example/src/parachain.rs
index 30aa5ba21e2e..7841003df7d5 100644
--- a/xcm/xcm-simulator/example/src/parachain.rs
+++ b/xcm/xcm-simulator/example/src/parachain.rs
@@ -19,7 +19,7 @@
 use codec::{Decode, Encode};
 use frame_support::{
 	construct_runtime, parameter_types,
-	traits::{All, AllowAll},
+	traits::Everything,
 	weights::{constants::WEIGHT_PER_SECOND, Weight},
 };
 use sp_core::H256;
@@ -39,7 +39,6 @@ use xcm::{
 	v0::{
 		Error as XcmError, ExecuteXcm,
 		Junction::{Parachain, Parent},
-		MultiAsset,
 		MultiLocation::{self, X1},
 		NetworkId, Outcome, Xcm,
 	},
@@ -80,7 +79,7 @@ impl frame_system::Config for Runtime {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type DbWeight = ();
-	type BaseCallFilter = AllowAll;
+	type BaseCallFilter = Everything;
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
 	type OnSetCode = ();
@@ -136,7 +135,7 @@ pub type LocalAssetTransactor =
 	XcmCurrencyAdapter<Balances, IsConcrete<KsmLocation>, LocationToAccountId, AccountId, ()>;
 
 pub type XcmRouter = super::ParachainXcmRouter<MsgQueue>;
-pub type Barrier = AllowUnpaidExecutionFrom<All<MultiLocation>>;
+pub type Barrier = AllowUnpaidExecutionFrom<Everything>;
 
 pub struct XcmConfig;
 impl Config for XcmConfig {
@@ -297,10 +296,10 @@ impl pallet_xcm::Config for Runtime {
 	type SendXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;
 	type XcmRouter = XcmRouter;
 	type ExecuteXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;
-	type XcmExecuteFilter = All<(MultiLocation, Xcm<Call>)>;
+	type XcmExecuteFilter = Everything;
 	type XcmExecutor = XcmExecutor<XcmConfig>;
 	type XcmTeleportFilter = ();
-	type XcmReserveTransferFilter = All<(MultiLocation, Vec<MultiAsset>)>;
+	type XcmReserveTransferFilter = Everything;
 	type Weigher = FixedWeightBounds<UnitWeightCost, Call>;
 	type LocationInverter = LocationInverter<Ancestry>;
 }
diff --git a/xcm/xcm-simulator/example/src/relay_chain.rs b/xcm/xcm-simulator/example/src/relay_chain.rs
index 3b7b2f2d4815..fcb10f5d352d 100644
--- a/xcm/xcm-simulator/example/src/relay_chain.rs
+++ b/xcm/xcm-simulator/example/src/relay_chain.rs
@@ -16,17 +16,13 @@
 
 //! Relay chain runtime mock.
 
-use frame_support::{
-	construct_runtime, parameter_types,
-	traits::{All, AllowAll},
-	weights::Weight,
-};
+use frame_support::{construct_runtime, parameter_types, traits::Everything, weights::Weight};
 use sp_core::H256;
 use sp_runtime::{testing::Header, traits::IdentityLookup, AccountId32};
 
 use polkadot_parachain::primitives::Id as ParaId;
 use polkadot_runtime_parachains::{configuration, origin, shared, ump};
-use xcm::v0::{MultiAsset, MultiLocation, NetworkId};
+use xcm::v0::{MultiLocation, NetworkId};
 use xcm_builder::{
 	AccountId32Aliases, AllowUnpaidExecutionFrom, ChildParachainAsNative,
 	ChildParachainConvertsVia, ChildSystemParachainAsSuperuser,
@@ -63,7 +59,7 @@ impl frame_system::Config for Runtime {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type DbWeight = ();
-	type BaseCallFilter = AllowAll;
+	type BaseCallFilter = Everything;
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
 	type OnSetCode = ();
@@ -118,7 +114,7 @@ parameter_types! {
 }
 
 pub type XcmRouter = super::RelayChainXcmRouter;
-pub type Barrier = AllowUnpaidExecutionFrom<All<MultiLocation>>;
+pub type Barrier = AllowUnpaidExecutionFrom<Everything>;
 
 pub struct XcmConfig;
 impl Config for XcmConfig {
@@ -145,8 +141,8 @@ impl pallet_xcm::Config for Runtime {
 	type ExecuteXcmOrigin = xcm_builder::EnsureXcmOrigin<Origin, LocalOriginToLocation>;
 	type XcmExecuteFilter = ();
 	type XcmExecutor = XcmExecutor<XcmConfig>;
-	type XcmTeleportFilter = All<(MultiLocation, Vec<MultiAsset>)>;
-	type XcmReserveTransferFilter = All<(MultiLocation, Vec<MultiAsset>)>;
+	type XcmTeleportFilter = Everything;
+	type XcmReserveTransferFilter = Everything;
 	type Weigher = FixedWeightBounds<BaseXcmWeight, Call>;
 	type LocationInverter = LocationInverter<Ancestry>;
 }