diff --git a/Cargo.lock b/Cargo.lock
index 7492465574e3..62c644694997 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1686,7 +1686,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1704,7 +1704,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "3.1.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1723,7 +1723,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "Inflector",
  "chrono",
@@ -1746,7 +1746,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-support"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1759,7 +1759,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1775,7 +1775,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1786,7 +1786,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -1812,7 +1812,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "Inflector",
  "frame-support-procedural-tools",
@@ -1824,7 +1824,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate 1.0.0",
@@ -1836,7 +1836,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1846,7 +1846,7 @@ dependencies = [
 [[package]]
 name = "frame-support-test"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-metadata",
  "frame-support",
@@ -1867,7 +1867,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -1884,7 +1884,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1898,7 +1898,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -1907,7 +1907,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -4297,7 +4297,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b"
 [[package]]
 name = "pallet-authority-discovery"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4313,7 +4313,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4328,7 +4328,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4352,7 +4352,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4367,7 +4367,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4382,7 +4382,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4399,7 +4399,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4414,7 +4414,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -4435,7 +4435,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4451,7 +4451,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4473,7 +4473,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -4489,7 +4489,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4509,7 +4509,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4526,7 +4526,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4540,7 +4540,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4556,7 +4556,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4570,7 +4570,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4586,7 +4586,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -4608,7 +4608,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4624,7 +4624,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4637,7 +4637,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -4652,7 +4652,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4668,7 +4668,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4688,7 +4688,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4704,7 +4704,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4718,7 +4718,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -4742,7 +4742,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -4753,7 +4753,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4767,7 +4767,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4786,7 +4786,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4801,7 +4801,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4817,7 +4817,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -4834,7 +4834,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -4845,7 +4845,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4861,7 +4861,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4877,7 +4877,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -7053,7 +7053,7 @@ dependencies = [
 [[package]]
 name = "remote-externalities"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "env_logger 0.8.2",
  "hex-literal",
@@ -7320,7 +7320,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7348,7 +7348,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "futures 0.3.13",
  "futures-timer 3.0.2",
@@ -7371,7 +7371,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -7387,7 +7387,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -7408,7 +7408,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -7419,7 +7419,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "chrono",
  "fdlimit",
@@ -7457,7 +7457,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "derive_more",
  "fnv",
@@ -7491,7 +7491,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -7521,7 +7521,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "sc-client-api",
  "sp-blockchain",
@@ -7532,7 +7532,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "derive_more",
  "fork-tree",
@@ -7578,7 +7578,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "derive_more",
  "futures 0.3.13",
@@ -7602,7 +7602,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -7615,7 +7615,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "futures 0.3.13",
  "futures-timer 3.0.2",
@@ -7642,7 +7642,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "log",
  "sc-client-api",
@@ -7656,7 +7656,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "derive_more",
  "lazy_static",
@@ -7685,7 +7685,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "derive_more",
  "parity-scale-codec",
@@ -7701,7 +7701,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7716,7 +7716,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7734,7 +7734,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "derive_more",
  "dyn-clone",
@@ -7773,7 +7773,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "derive_more",
  "finality-grandpa",
@@ -7797,7 +7797,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-warp-sync"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "derive_more",
  "futures 0.3.13",
@@ -7818,7 +7818,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.13",
@@ -7836,7 +7836,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7856,7 +7856,7 @@ dependencies = [
 [[package]]
 name = "sc-light"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "hash-db",
  "lazy_static",
@@ -7875,7 +7875,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "async-std",
  "async-trait",
@@ -7928,7 +7928,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "futures 0.3.13",
  "futures-timer 3.0.2",
@@ -7945,7 +7945,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
@@ -7973,7 +7973,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "futures 0.3.13",
  "libp2p",
@@ -7986,7 +7986,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -7995,7 +7995,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "futures 0.3.13",
  "hash-db",
@@ -8029,7 +8029,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "derive_more",
  "futures 0.3.13",
@@ -8053,7 +8053,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "futures 0.1.29",
  "jsonrpc-core",
@@ -8071,7 +8071,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "directories",
  "exit-future",
@@ -8134,7 +8134,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8149,7 +8149,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -8169,7 +8169,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "chrono",
  "futures 0.3.13",
@@ -8189,7 +8189,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -8216,7 +8216,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -8227,7 +8227,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-graph"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "derive_more",
  "futures 0.3.13",
@@ -8249,7 +8249,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "futures 0.3.13",
  "futures-diagnose",
@@ -8665,7 +8665,7 @@ dependencies = [
 [[package]]
 name = "sp-allocator"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "log",
  "sp-core",
@@ -8677,7 +8677,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "hash-db",
  "log",
@@ -8694,7 +8694,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate 1.0.0",
@@ -8706,7 +8706,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -8718,7 +8718,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -8731,7 +8731,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8743,7 +8743,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -8754,7 +8754,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8766,7 +8766,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "futures 0.3.13",
  "log",
@@ -8784,7 +8784,7 @@ dependencies = [
 [[package]]
 name = "sp-chain-spec"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "serde",
  "serde_json",
@@ -8793,7 +8793,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "futures 0.3.13",
  "futures-timer 3.0.2",
@@ -8819,7 +8819,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "merlin",
  "parity-scale-codec",
@@ -8840,7 +8840,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "parity-scale-codec",
  "sp-arithmetic",
@@ -8850,7 +8850,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -8862,7 +8862,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -8906,7 +8906,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "kvdb",
  "parking_lot 0.11.1",
@@ -8915,7 +8915,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8925,7 +8925,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -8936,7 +8936,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -8953,7 +8953,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -8965,7 +8965,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "futures 0.3.13",
  "hash-db",
@@ -8989,7 +8989,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -9000,7 +9000,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -9017,7 +9017,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -9030,7 +9030,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections-compact"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -9041,7 +9041,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -9051,7 +9051,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "backtrace",
 ]
@@ -9059,7 +9059,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "serde",
  "sp-core",
@@ -9068,7 +9068,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -9089,7 +9089,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -9106,7 +9106,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "Inflector",
  "proc-macro-crate 1.0.0",
@@ -9118,7 +9118,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "serde",
  "serde_json",
@@ -9127,7 +9127,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -9140,7 +9140,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -9150,7 +9150,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "hash-db",
  "log",
@@ -9172,12 +9172,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 
 [[package]]
 name = "sp-storage"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -9190,7 +9190,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "log",
  "sp-core",
@@ -9203,7 +9203,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -9216,7 +9216,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -9229,7 +9229,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "derive_more",
  "futures 0.3.13",
@@ -9245,7 +9245,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -9259,7 +9259,7 @@ dependencies = [
 [[package]]
 name = "sp-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "futures 0.3.13",
  "futures-core",
@@ -9271,7 +9271,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -9283,7 +9283,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -9440,7 +9440,7 @@ dependencies = [
 [[package]]
 name = "substrate-browser-utils"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "chrono",
  "console_error_panic_hook",
@@ -9466,7 +9466,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "platforms",
 ]
@@ -9474,7 +9474,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.13",
@@ -9497,7 +9497,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "async-std",
  "derive_more",
@@ -9511,7 +9511,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "futures 0.1.29",
  "futures 0.3.13",
@@ -9539,7 +9539,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "futures 0.3.13",
  "substrate-test-utils-derive",
@@ -9549,7 +9549,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "quote",
@@ -10290,7 +10290,7 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
 [[package]]
 name = "try-runtime-cli"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate?branch=a-sync-fix#1cfbcbce4edecb4ba1b3e66db25028e3293e1366"
 dependencies = [
  "frame-try-runtime",
  "log",
diff --git a/bridges/bin/millau/node/Cargo.toml b/bridges/bin/millau/node/Cargo.toml
index 6f7aa94e6ffa..5a28fe39d557 100644
--- a/bridges/bin/millau/node/Cargo.toml
+++ b/bridges/bin/millau/node/Cargo.toml
@@ -24,31 +24,31 @@ pallet-message-lane-rpc = { path = "../../../modules/message-lane/rpc" }
 
 # Substrate Dependencies
 
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" }
-frame-benchmarking-cli = { 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-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-rpc = { 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-inherents = { 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" }
-substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-cli = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", features = ["wasmtime"] }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-executor = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 
 [build-dependencies]
 build-script-utils = { package = "substrate-build-script-utils", version = "2.0" }
-frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
+frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 vergen = "3.1.0"
 
 [features]
diff --git a/bridges/bin/millau/runtime/Cargo.toml b/bridges/bin/millau/runtime/Cargo.toml
index d163661284b6..6c1b08d9f6c2 100644
--- a/bridges/bin/millau/runtime/Cargo.toml
+++ b/bridges/bin/millau/runtime/Cargo.toml
@@ -28,31 +28,31 @@ pallet-substrate-bridge = { path = "../../../modules/substrate", default-feature
 
 # 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 }
-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-inherents = { 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-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", branch = "a-sync-fix" , default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+pallet-session = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-session = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-version = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
 
 [build-dependencies]
 wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "2.0.0" }
diff --git a/bridges/bin/rialto/node/Cargo.toml b/bridges/bin/rialto/node/Cargo.toml
index f99178c77aea..3e585cb8d62c 100644
--- a/bridges/bin/rialto/node/Cargo.toml
+++ b/bridges/bin/rialto/node/Cargo.toml
@@ -24,32 +24,32 @@ 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" }
-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-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-telemetry = { 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-inherents = { 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" }
-substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-cli = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", features = ["wasmtime"] }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-executor = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 
 [build-dependencies]
 build-script-utils = { package = "substrate-build-script-utils", version = "2.0" }
-frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
+frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 vergen = "3.1.0"
 
 [features]
diff --git a/bridges/bin/rialto/runtime/Cargo.toml b/bridges/bin/rialto/runtime/Cargo.toml
index 517ddff9cb67..3d5d72086d88 100644
--- a/bridges/bin/rialto/runtime/Cargo.toml
+++ b/bridges/bin/rialto/runtime/Cargo.toml
@@ -34,33 +34,33 @@ 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 }
-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", branch = "a-sync-fix" , default-features = false, optional = true }
+frame-executive = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+pallet-session = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-session = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-version = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
 
 [dev-dependencies]
 libsecp256k1 = { version = "0.3.4", features = ["hmac"] }
diff --git a/bridges/bin/runtime-common/Cargo.toml b/bridges/bin/runtime-common/Cargo.toml
index 69b618e7daa5..5bfe3d3b822c 100644
--- a/bridges/bin/runtime-common/Cargo.toml
+++ b/bridges/bin/runtime-common/Cargo.toml
@@ -23,12 +23,12 @@ pallet-substrate-bridge = { path = "../../modules/substrate", default-features =
 
 # 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-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", branch = "a-sync-fix" , default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false, optional = true }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
 
 [features]
 default = ["std"]
diff --git a/bridges/modules/call-dispatch/Cargo.toml b/bridges/modules/call-dispatch/Cargo.toml
index 64910df861c3..f21197566418 100644
--- a/bridges/modules/call-dispatch/Cargo.toml
+++ b/bridges/modules/call-dispatch/Cargo.toml
@@ -16,14 +16,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", branch = "a-sync-fix" , default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
 
 [dev-dependencies]
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 serde = "1.0"
 
 [features]
diff --git a/bridges/modules/currency-exchange/Cargo.toml b/bridges/modules/currency-exchange/Cargo.toml
index cf58b5e81c34..93bc63453349 100644
--- a/bridges/modules/currency-exchange/Cargo.toml
+++ b/bridges/modules/currency-exchange/Cargo.toml
@@ -17,15 +17,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", branch = "a-sync-fix" , default-features = false, optional = true }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false, optional = true }
 
 [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 = "a-sync-fix" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 
 [features]
 default = ["std"]
diff --git a/bridges/modules/ethereum-contract/builtin/Cargo.toml b/bridges/modules/ethereum-contract/builtin/Cargo.toml
index d17b0ba7e118..4dc3c974b942 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 = "a-sync-fix" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
diff --git a/bridges/modules/ethereum/Cargo.toml b/bridges/modules/ethereum/Cargo.toml
index 1912f45babb5..7e4023a63722 100644
--- a/bridges/modules/ethereum/Cargo.toml
+++ b/bridges/modules/ethereum/Cargo.toml
@@ -17,12 +17,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", branch = "a-sync-fix" , default-features = false, optional = true }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
 
 [dev-dependencies]
 libsecp256k1 = { version = "0.3.4", features = ["hmac"] }
diff --git a/bridges/modules/finality-verifier/Cargo.toml b/bridges/modules/finality-verifier/Cargo.toml
index 35d4d6880aa9..1ec1e322cd56 100644
--- a/bridges/modules/finality-verifier/Cargo.toml
+++ b/bridges/modules/finality-verifier/Cargo.toml
@@ -19,15 +19,15 @@ 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-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", branch = "a-sync-fix" , default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
 
 [dev-dependencies]
 bp-test-utils = {path = "../../primitives/test-utils" }
 pallet-substrate-bridge = { path = "../../modules/substrate" }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 
 
 [features]
diff --git a/bridges/modules/message-lane/Cargo.toml b/bridges/modules/message-lane/Cargo.toml
index abbfb6076124..a57cfb02243b 100644
--- a/bridges/modules/message-lane/Cargo.toml
+++ b/bridges/modules/message-lane/Cargo.toml
@@ -19,17 +19,17 @@ 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", branch = "a-sync-fix" , default-features = false, optional = true }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
 
 [dev-dependencies]
 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 = "a-sync-fix" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 
 [features]
 default = ["std"]
diff --git a/bridges/modules/message-lane/rpc/Cargo.toml b/bridges/modules/message-lane/rpc/Cargo.toml
index 23dac80b407c..96a6153485bd 100644
--- a/bridges/modules/message-lane/rpc/Cargo.toml
+++ b/bridges/modules/message-lane/rpc/Cargo.toml
@@ -21,9 +21,9 @@ bp-message-lane = { path = "../../../primitives/message-lane" }
 
 # Substrate Dependencies
 
-sc-client-api = { 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-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
diff --git a/bridges/modules/shift-session-manager/Cargo.toml b/bridges/modules/shift-session-manager/Cargo.toml
index 6dac97ddde60..5bcd8cf8572a 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", branch = "a-sync-fix" , default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+pallet-session = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-staking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
 
 [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 = "a-sync-fix" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 serde = "1.0"
 
 [features]
diff --git a/bridges/modules/substrate/Cargo.toml b/bridges/modules/substrate/Cargo.toml
index 490aa2098b9f..6489fe1eb5f6 100644
--- a/bridges/modules/substrate/Cargo.toml
+++ b/bridges/modules/substrate/Cargo.toml
@@ -20,18 +20,18 @@ 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-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", branch = "a-sync-fix" , default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
 
 [dev-dependencies]
 bp-test-utils = {path = "../../primitives/test-utils" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/currency-exchange/Cargo.toml b/bridges/primitives/currency-exchange/Cargo.toml
index 43367ba7992b..af7cc5fb11bd 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", branch = "a-sync-fix" , default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/ethereum-poa/Cargo.toml b/bridges/primitives/ethereum-poa/Cargo.toml
index cd2c3a97a0f3..d89e8c9db634 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", branch = "a-sync-fix" , default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
 
 [dev-dependencies]
 hex-literal = "0.2"
diff --git a/bridges/primitives/header-chain/Cargo.toml b/bridges/primitives/header-chain/Cargo.toml
index dc58dafb979e..f888a2a29617 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", branch = "a-sync-fix" , default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
 
 [dev-dependencies]
 bp-test-utils = { path = "../test-utils" }
diff --git a/bridges/primitives/kusama/Cargo.toml b/bridges/primitives/kusama/Cargo.toml
index 784f0b013289..f3fa0f406cbb 100644
--- a/bridges/primitives/kusama/Cargo.toml
+++ b/bridges/primitives/kusama/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", branch = "a-sync-fix" , default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/message-lane/Cargo.toml b/bridges/primitives/message-lane/Cargo.toml
index cbddcb161460..8ced7620f1e9 100644
--- a/bridges/primitives/message-lane/Cargo.toml
+++ b/bridges/primitives/message-lane/Cargo.toml
@@ -15,9 +15,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", branch = "a-sync-fix" , default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/millau/Cargo.toml b/bridges/primitives/millau/Cargo.toml
index 124d8199e2c2..fb3cabb680ed 100644
--- a/bridges/primitives/millau/Cargo.toml
+++ b/bridges/primitives/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", branch = "a-sync-fix" , default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/polkadot/Cargo.toml b/bridges/primitives/polkadot/Cargo.toml
index f7c9b9717d1c..4512d0d96e58 100644
--- a/bridges/primitives/polkadot/Cargo.toml
+++ b/bridges/primitives/polkadot/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", branch = "a-sync-fix" , default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/rialto/Cargo.toml b/bridges/primitives/rialto/Cargo.toml
index d6c12fc84809..45620b41181c 100644
--- a/bridges/primitives/rialto/Cargo.toml
+++ b/bridges/primitives/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", branch = "a-sync-fix" , default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/runtime/Cargo.toml b/bridges/primitives/runtime/Cargo.toml
index b8e511fa56f8..9dcee717befe 100644
--- a/bridges/primitives/runtime/Cargo.toml
+++ b/bridges/primitives/runtime/Cargo.toml
@@ -12,11 +12,11 @@ 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-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" , default-features = false }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/test-utils/Cargo.toml b/bridges/primitives/test-utils/Cargo.toml
index 396e0e764635..a42d9f4197fb 100644
--- a/bridges/primitives/test-utils/Cargo.toml
+++ b/bridges/primitives/test-utils/Cargo.toml
@@ -8,6 +8,6 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 [dependencies]
 finality-grandpa = { version = "0.14.0" }
 bp-header-chain = { path = "../header-chain" }
-sp-finality-grandpa = { 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-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
diff --git a/bridges/relays/ethereum/Cargo.toml b/bridges/relays/ethereum/Cargo.toml
index 860c0815e2e8..be350d2328b2 100644
--- a/bridges/relays/ethereum/Cargo.toml
+++ b/bridges/relays/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 = "a-sync-fix" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
diff --git a/bridges/relays/kusama-client/Cargo.toml b/bridges/relays/kusama-client/Cargo.toml
index 04958cf2b361..34699b2f0b4b 100644
--- a/bridges/relays/kusama-client/Cargo.toml
+++ b/bridges/relays/kusama-client/Cargo.toml
@@ -17,9 +17,9 @@ bp-kusama = { path = "../../primitives/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 = "a-sync-fix" }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
diff --git a/bridges/relays/millau-client/Cargo.toml b/bridges/relays/millau-client/Cargo.toml
index 5f9cbd170c93..13b663174a68 100644
--- a/bridges/relays/millau-client/Cargo.toml
+++ b/bridges/relays/millau-client/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 = "a-sync-fix" }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
diff --git a/bridges/relays/polkadot-client/Cargo.toml b/bridges/relays/polkadot-client/Cargo.toml
index 8764b6509b24..b4b609e39f2f 100644
--- a/bridges/relays/polkadot-client/Cargo.toml
+++ b/bridges/relays/polkadot-client/Cargo.toml
@@ -17,9 +17,9 @@ bp-polkadot = { path = "../../primitives/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 = "a-sync-fix" }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
diff --git a/bridges/relays/rialto-client/Cargo.toml b/bridges/relays/rialto-client/Cargo.toml
index 6142ba05c963..a00c657d8985 100644
--- a/bridges/relays/rialto-client/Cargo.toml
+++ b/bridges/relays/rialto-client/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 = "a-sync-fix" }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
diff --git a/bridges/relays/substrate-client/Cargo.toml b/bridges/relays/substrate-client/Cargo.toml
index 016a7d7d3371..e4d211aebc39 100644
--- a/bridges/relays/substrate-client/Cargo.toml
+++ b/bridges/relays/substrate-client/Cargo.toml
@@ -23,15 +23,15 @@ 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-runtime = { 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 = "a-sync-fix" }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-version = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 
 #[dev-dependencies]
 futures = "0.3.7"
diff --git a/bridges/relays/substrate/Cargo.toml b/bridges/relays/substrate/Cargo.toml
index 120501e511fe..476e3e777fa3 100644
--- a/bridges/relays/substrate/Cargo.toml
+++ b/bridges/relays/substrate/Cargo.toml
@@ -42,8 +42,8 @@ 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" }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
diff --git a/bridges/relays/utils/Cargo.toml b/bridges/relays/utils/Cargo.toml
index ce6a20bbc4fe..1243a6050efe 100644
--- a/bridges/relays/utils/Cargo.toml
+++ b/bridges/relays/utils/Cargo.toml
@@ -19,4 +19,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 = "a-sync-fix" }
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 3bc15e0bdc9a..a580980260b6 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -24,19 +24,19 @@ futures = "0.3.12"
 service = { package = "polkadot-service", path = "../node/service", default-features = false, optional = true }
 polkadot-parachain = { path = "../parachain", 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 = "a-sync-fix" }
+frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", optional = true }
+try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", optional = true }
+sc-cli = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", optional = true }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", optional = true }
+browser-utils = { package = "substrate-browser-utils", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", optional = true }
 
 # 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", branch = "a-sync-fix", default-features = false }
 
 [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 = "a-sync-fix" }
 
 [features]
 default = [ "wasmtime", "db", "cli", "full-node", "trie-memory-tracker", "polkadot-parachain" ]
diff --git a/core-primitives/Cargo.toml b/core-primitives/Cargo.toml
index 235830be5d5d..7ec7e27ce19d 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", branch = "a-sync-fix", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
 parity-scale-codec = { version = "2.0.0", default-features = false, features = [ "derive" ] }
 parity-util-mem = { version = "0.9.0", default-features = false, optional = true }
 
diff --git a/erasure-coding/Cargo.toml b/erasure-coding/Cargo.toml
index 2c041e398af1..5a805caeb386 100644
--- a/erasure-coding/Cargo.toml
+++ b/erasure-coding/Cargo.toml
@@ -8,6 +8,6 @@ edition = "2018"
 primitives = { package = "polkadot-primitives", path = "../primitives" }
 novelpoly = { package = "reed-solomon-novelpoly", version = "=0.0.3" }
 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 = "a-sync-fix" }
+trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 thiserror = "1.0.23"
diff --git a/node/collation-generation/Cargo.toml b/node/collation-generation/Cargo.toml
index fdcfa6ae1fd7..176f63b3aa72 100644
--- a/node/collation-generation/Cargo.toml
+++ b/node/collation-generation/Cargo.toml
@@ -12,7 +12,7 @@ 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-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 thiserror = "1.0.23"
 
 [dev-dependencies]
diff --git a/node/core/approval-voting/Cargo.toml b/node/core/approval-voting/Cargo.toml
index f3fe0fcb0396..9bdd52fd47e0 100644
--- a/node/core/approval-voting/Cargo.toml
+++ b/node/core/approval-voting/Cargo.toml
@@ -23,20 +23,20 @@ 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-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", branch = "a-sync-fix", default-features = false }
+sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false, features = ["full_crypto"] }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
 
 [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 = "a-sync-fix" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 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 00572ca58bc2..23b6775298de 100644
--- a/node/core/av-store/Cargo.toml
+++ b/node/core/av-store/Cargo.toml
@@ -20,7 +20,7 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 polkadot-overseer = { path = "../../overseer" }
 polkadot-primitives = { path = "../../../primitives" }
 
-sc-service = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
 
 [dev-dependencies]
 log = "0.4.13"
@@ -28,8 +28,8 @@ env_logger = "0.8.2"
 assert_matches = "1.4.0"
 kvdb-memorydb = "0.9.0"
 
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 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 = "a-sync-fix" }
 parking_lot = "0.11.1"
diff --git a/node/core/backing/Cargo.toml b/node/core/backing/Cargo.toml
index a6b04c03ae92..7ef552a98511 100644
--- a/node/core/backing/Cargo.toml
+++ b/node/core/backing/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 futures = "0.3.12"
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 polkadot-primitives = { path = "../../../primitives" }
 polkadot-node-primitives = { path = "../../primitives" }
 polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
@@ -18,10 +18,10 @@ tracing = "0.1.25"
 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-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 futures = { version = "0.3.12", 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 e336af9522c1..6f4e8eba8ced 100644
--- a/node/core/bitfield-signing/Cargo.toml
+++ b/node/core/bitfield-signing/Cargo.toml
@@ -10,6 +10,6 @@ tracing = "0.1.25"
 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 = "a-sync-fix" }
 wasm-timer = "0.2.5"
 thiserror = "1.0.23"
diff --git a/node/core/candidate-selection/Cargo.toml b/node/core/candidate-selection/Cargo.toml
index ee58baa1f802..27f9b91d8b5d 100644
--- a/node/core/candidate-selection/Cargo.toml
+++ b/node/core/candidate-selection/Cargo.toml
@@ -9,7 +9,7 @@ futures = "0.3.12"
 tracing = "0.1.25"
 thiserror = "1.0.23"
 
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 
 polkadot-primitives = { path = "../../../primitives" }
 polkadot-node-subsystem = { path = "../../subsystem" }
@@ -17,4 +17,4 @@ polkadot-node-primitives = { path = "../../primitives" }
 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 = "a-sync-fix" }
diff --git a/node/core/candidate-validation/Cargo.toml b/node/core/candidate-validation/Cargo.toml
index 8a40f3a47500..4118318085ae 100644
--- a/node/core/candidate-validation/Cargo.toml
+++ b/node/core/candidate-validation/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 futures = "0.3.12"
 tracing = "0.1.25"
 
-sp-core = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["bit-vec", "derive"] }
 
 polkadot-primitives = { path = "../../../primitives" }
@@ -18,7 +18,7 @@ polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsys
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 
 [dev-dependencies]
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 futures = { version = "0.3.12", features = ["thread-pool"] }
 assert_matches = "1.4.0"
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
diff --git a/node/core/chain-api/Cargo.toml b/node/core/chain-api/Cargo.toml
index 707fa812f004..fa0e57a2bb42 100644
--- a/node/core/chain-api/Cargo.toml
+++ b/node/core/chain-api/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 futures = "0.3.12"
 tracing = "0.1.25"
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 polkadot-primitives = { path = "../../../primitives" }
 polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
@@ -16,4 +16,4 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 futures = { version = "0.3.12", features = ["thread-pool"] }
 maplit = "1.0.2"
 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 = "a-sync-fix" }
diff --git a/node/core/proposer/Cargo.toml b/node/core/proposer/Cargo.toml
index f2532d61d1cd..e8784ce5d3da 100644
--- a/node/core/proposer/Cargo.toml
+++ b/node/core/proposer/Cargo.toml
@@ -11,15 +11,15 @@ tracing = "0.1.25"
 polkadot-node-subsystem = { path = "../../subsystem" }
 polkadot-overseer = { path = "../../overseer" }
 polkadot-primitives = { path = "../../../primitives" }
-sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { 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-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
-prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
diff --git a/node/core/provisioner/Cargo.toml b/node/core/provisioner/Cargo.toml
index bff63e230af0..c5bf96f881de 100644
--- a/node/core/provisioner/Cargo.toml
+++ b/node/core/provisioner/Cargo.toml
@@ -15,5 +15,5 @@ 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 = "a-sync-fix" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
diff --git a/node/core/runtime-api/Cargo.toml b/node/core/runtime-api/Cargo.toml
index 5d0889bf5a5d..ef68a849d75c 100644
--- a/node/core/runtime-api/Cargo.toml
+++ b/node/core/runtime-api/Cargo.toml
@@ -10,16 +10,16 @@ tracing = "0.1.25"
 memory-lru = "0.1.0"
 parity-util-mem = { version = "0.9.0", default-features = false }
 
-sp-api = { 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 = "a-sync-fix" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 
 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 = "a-sync-fix" }
 futures = { version = "0.3.12", 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 32aa4491f980..112a3f3561e4 100644
--- a/node/jaeger/Cargo.toml
+++ b/node/jaeger/Cargo.toml
@@ -11,8 +11,8 @@ mick-jaeger = "0.1.4"
 lazy_static = "1.4"
 parking_lot = "0.11.1"
 polkadot-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 = "a-sync-fix" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 thiserror = "1.0.23"
 log = "0.4.13"
 parity-scale-codec = { version = "2.0.0", default-features = false }
diff --git a/node/network/approval-distribution/Cargo.toml b/node/network/approval-distribution/Cargo.toml
index 900582aa988e..2b3da6bb3373 100644
--- a/node/network/approval-distribution/Cargo.toml
+++ b/node/network/approval-distribution/Cargo.toml
@@ -15,7 +15,7 @@ futures = "0.3.8"
 tracing = "0.1.25"
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["std"] }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", features = ["std"] }
 
 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 85fa6c549f7c..651dd3ac5a51 100644
--- a/node/network/availability-distribution/Cargo.toml
+++ b/node/network/availability-distribution/Cargo.toml
@@ -14,20 +14,20 @@ polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsys
 polkadot-node-network-protocol = { path = "../../network/protocol" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 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 = "a-sync-fix" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", features = ["std"]  }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 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-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", branch = "a-sync-fix", features = ["std"] }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-network = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 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 21ae777bad12..315ceba46b98 100644
--- a/node/network/availability-recovery/Cargo.toml
+++ b/node/network/availability-recovery/Cargo.toml
@@ -25,9 +25,9 @@ futures-timer = "3.0.2"
 log = "0.4.11"
 smallvec = "1.5.1"
 
-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 = "a-sync-fix" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-network = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 
 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 f19807a91bea..85127e0b85ba 100644
--- a/node/network/bitfield-distribution/Cargo.toml
+++ b/node/network/bitfield-distribution/Cargo.toml
@@ -16,9 +16,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 = "a-sync-fix" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 maplit = "1.0.2"
 log = "0.4.13"
 env_logger = "0.8.2"
diff --git a/node/network/bridge/Cargo.toml b/node/network/bridge/Cargo.toml
index 8afa884cf1d5..b3838cf3e137 100644
--- a/node/network/bridge/Cargo.toml
+++ b/node/network/bridge/Cargo.toml
@@ -10,8 +10,8 @@ futures = "0.3.12"
 tracing = "0.1.25"
 polkadot-primitives = { path = "../../../primitives" }
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
-sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-network = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
 polkadot-node-network-protocol = { path = "../protocol" }
 strum = "0.20.0"
@@ -21,5 +21,5 @@ assert_matches = "1.4.0"
 parking_lot = "0.11.1"
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util"}
-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 = "a-sync-fix" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
diff --git a/node/network/collator-protocol/Cargo.toml b/node/network/collator-protocol/Cargo.toml
index c8820c195510..9e7b2f67342e 100644
--- a/node/network/collator-protocol/Cargo.toml
+++ b/node/network/collator-protocol/Cargo.toml
@@ -11,8 +11,8 @@ futures-timer = "3"
 thiserror = "1.0.23"
 tracing = "0.1.25"
 
-sp-core = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-runtime = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 
 polkadot-primitives = { path = "../../../primitives" }
 polkadot-node-network-protocol = { path = "../../network/protocol" }
@@ -25,7 +25,7 @@ log = "0.4.13"
 env_logger = "0.8.2"
 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" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", features = ["std"] }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 
 polkadot-subsystem-testhelpers = { package = "polkadot-node-subsystem-test-helpers", path = "../../subsystem-test-helpers" }
diff --git a/node/network/pov-distribution/Cargo.toml b/node/network/pov-distribution/Cargo.toml
index ae405638c4c6..ccc9a13ff03e 100644
--- a/node/network/pov-distribution/Cargo.toml
+++ b/node/network/pov-distribution/Cargo.toml
@@ -19,7 +19,7 @@ assert_matches = "1.4.0"
 env_logger = "0.8.1"
 log = "0.4.13"
 
-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 = "a-sync-fix" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
diff --git a/node/network/protocol/Cargo.toml b/node/network/protocol/Cargo.toml
index f7a0c72b2a08..68f0bfb05421 100644
--- a/node/network/protocol/Cargo.toml
+++ b/node/network/protocol/Cargo.toml
@@ -10,6 +10,6 @@ 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-network = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 strum = { version = "0.20", features = ["derive"] }
 futures = "0.3.12"
diff --git a/node/network/statement-distribution/Cargo.toml b/node/network/statement-distribution/Cargo.toml
index 5bcae793a348..f322edae8c4e 100644
--- a/node/network/statement-distribution/Cargo.toml
+++ b/node/network/statement-distribution/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 futures = "0.3.12"
 tracing = "0.1.25"
 polkadot-primitives = { path = "../../../primitives" }
-sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-staking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
 polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
 polkadot-node-primitives = { path = "../../primitives" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
@@ -20,8 +20,8 @@ indexmap = "1.6.1"
 [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" }
-sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
diff --git a/node/overseer/Cargo.toml b/node/overseer/Cargo.toml
index 9a3ef00c6402..b9f888cdde48 100644
--- a/node/overseer/Cargo.toml
+++ b/node/overseer/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 async-trait = "0.1.42"
-client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "master" }
+client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 futures = "0.3.12"
 futures-timer = "3.0.2"
 oorandom = "11.1.3"
@@ -17,7 +17,7 @@ polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../subsystem
 tracing = "0.1.25"
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 polkadot-node-network-protocol = { path = "../network/protocol" }
 futures = { version = "0.3.12", features = ["thread-pool"] }
 futures-timer = "3.0.2"
diff --git a/node/primitives/Cargo.toml b/node/primitives/Cargo.toml
index 6259d114269c..955aa1b3e403 100644
--- a/node/primitives/Cargo.toml
+++ b/node/primitives/Cargo.toml
@@ -10,10 +10,10 @@ futures = "0.3.12"
 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" }
+runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-consensus-vrf = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 schnorrkel = "0.9.1"
 thiserror = "1.0.22"
diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml
index 9f9b7b58c72d..8a7e99841f25 100644
--- a/node/service/Cargo.toml
+++ b/node/service/Cargo.toml
@@ -6,53 +6,53 @@ 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" }
-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 = { 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-finality-grandpa-warp-sync = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
-sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-keystore = { 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 = "a-sync-fix" }
+babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-executor = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-finality-grandpa-warp-sync = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", optional = true }
+sc-network = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 
 # Substrate Primitives
-sp-authority-discovery = { 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" }
-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-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-session = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-storage = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 
 # 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-babe = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 
 # Substrate Other
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" }
-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-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 
 # External Crates
 futures = "0.3.12"
diff --git a/node/subsystem-test-helpers/Cargo.toml b/node/subsystem-test-helpers/Cargo.toml
index a1751146c9b5..68cf9e5519dd 100644
--- a/node/subsystem-test-helpers/Cargo.toml
+++ b/node/subsystem-test-helpers/Cargo.toml
@@ -18,9 +18,9 @@ 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 = "a-sync-fix" }
 smallvec = "1.6.1"
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 
 [dev-dependencies]
 polkadot-overseer = { path = "../overseer" }
diff --git a/node/subsystem-util/Cargo.toml b/node/subsystem-util/Cargo.toml
index abd04d3cc40a..3f19e245a702 100644
--- a/node/subsystem-util/Cargo.toml
+++ b/node/subsystem-util/Cargo.toml
@@ -23,11 +23,11 @@ polkadot-node-network-protocol = { path = "../network/protocol" }
 polkadot-primitives = { path = "../../primitives" }
 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 = "a-sync-fix" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 
 [dev-dependencies]
 assert_matches = "1.4.0"
diff --git a/node/subsystem/Cargo.toml b/node/subsystem/Cargo.toml
index 590af20343e8..2603ded42a6e 100644
--- a/node/subsystem/Cargo.toml
+++ b/node/subsystem/Cargo.toml
@@ -23,10 +23,10 @@ polkadot-primitives = { path = "../../primitives" }
 polkadot-statement-table = { path = "../../statement-table" }
 polkadot-node-jaeger = { path = "../jaeger" }
 polkadot-procmacro-subsystem-dispatch-gen = { path = "dispatch-gen" }
-sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-network = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 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 = "a-sync-fix" }
+substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 thiserror = "1.0.23"
 log = "0.4.13"
 
diff --git a/node/test/client/Cargo.toml b/node/test/client/Cargo.toml
index 0282ec536608..67740374bf1e 100644
--- a/node/test/client/Cargo.toml
+++ b/node/test/client/Cargo.toml
@@ -14,19 +14,19 @@ 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 = "a-sync-fix" }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 
 [dev-dependencies]
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
diff --git a/node/test/service/Cargo.toml b/node/test/service/Cargo.toml
index e0365b5095d1..81afd5e82855 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 = "a-sync-fix" }
+sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-cli = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-executor = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-network = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 
 [dev-dependencies]
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
 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 = "a-sync-fix" }
 tokio = { version = "0.2", features = ["macros"] }
diff --git a/parachain/Cargo.toml b/parachain/Cargo.toml
index 04b64bca6c57..23da5f91c9b1 100644
--- a/parachain/Cargo.toml
+++ b/parachain/Cargo.toml
@@ -11,19 +11,19 @@ edition = "2018"
 # various unnecessary Substrate-specific endpoints.
 parity-scale-codec = { version = "2.0.0", default-features = false, features = [ "derive" ] }
 parity-util-mem = { version = "0.9.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 }
-sp-wasm-interface = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-wasm-interface = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
 polkadot-core-primitives = { path = "../core-primitives", default-features = false }
 derive_more = "0.99.11"
 
 # all optional crates.
 thiserror = { version = "1.0.22", optional = true }
 serde = { version = "1.0.117", default-features = false, features = [ "derive" ], optional = true }
-sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
-sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
+sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", optional = true }
+sc-executor = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", optional = true }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", optional = true }
 parking_lot = { version = "0.11.1", optional = true }
 log = { version = "0.4.11", optional = true }
 futures = { version = "0.3.8", optional = true }
diff --git a/parachain/test-parachains/Cargo.toml b/parachain/test-parachains/Cargo.toml
index f49ac8e2f2b6..75c5049cf27e 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 = "a-sync-fix" }
 
 [features]
 default = [ "std" ]
diff --git a/parachain/test-parachains/adder/Cargo.toml b/parachain/test-parachains/adder/Cargo.toml
index c881b6031b96..01423d32e4ce 100644
--- a/parachain/test-parachains/adder/Cargo.toml
+++ b/parachain/test-parachains/adder/Cargo.toml
@@ -9,12 +9,12 @@ 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", branch = "a-sync-fix", default-features = false }
 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", branch = "a-sync-fix", default-features = false, features = [ "disable_allocator" ] }
 
 [build-dependencies]
 substrate-wasm-builder = "3.0.0"
diff --git a/parachain/test-parachains/adder/collator/Cargo.toml b/parachain/test-parachains/adder/collator/Cargo.toml
index 445d175af542..eb04c0333b69 100644
--- a/parachain/test-parachains/adder/collator/Cargo.toml
+++ b/parachain/test-parachains/adder/collator/Cargo.toml
@@ -23,18 +23,18 @@ polkadot-service = { path = "../../../../node/service" }
 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 = "a-sync-fix" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 
 [dev-dependencies]
 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 = "a-sync-fix" }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 
 tokio = { version = "0.2", features = ["macros"] }
 
diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
index 93390a4023b5..b05466d3f96e 100644
--- a/primitives/Cargo.toml
+++ b/primitives/Cargo.toml
@@ -7,23 +7,23 @@ 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-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", branch = "a-sync-fix", default-features = false }
+inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", optional = true }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-version = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-staking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
 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", branch = "a-sync-fix", default-features = false }
 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", branch = "a-sync-fix", default-features = false }
 hex-literal = "0.3.1"
 parity-util-mem = { version = "0.9.0", default-features = false, optional = true }
 thiserror = "1.0.23"
@@ -32,7 +32,7 @@ thiserror = "1.0.23"
 zstd = "0.5.0"
 
 [dev-dependencies]
-sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 pretty_assertions = "0.6.1"
 
 [features]
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index 3a51aea9e075..e5c22d4cb35d 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -7,24 +7,24 @@ 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 = "sp-transaction-pool", 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-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix"  }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix"  }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix"  }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix"  }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix"  }
+sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix"  }
+sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix"  }
+sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix"}
+sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix"}
+sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix"}
+sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix"}
+sc-sync-state-rpc = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix"}
+txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix"  }
+pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 parity-scale-codec = { version = "2.0.0", default-features = false }
-sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
index c26ec67fe62f..c410689eccc4 100644
--- a/runtime/common/Cargo.toml
+++ b/runtime/common/Cargo.toml
@@ -14,29 +14,29 @@ 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", branch = "a-sync-fix", default-features = false }
+inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-session = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-staking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", 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 }
-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-authorship = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-session = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+frame-system = {git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
 
-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", branch = "a-sync-fix", default-features = false, optional = true }
+pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features=false, optional = true }
 
 primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
 libsecp256k1 = { version = "0.3.5", default-features = false, optional = true }
@@ -46,15 +46,15 @@ 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-randomness-collective-flip = { 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 = "a-sync-fix" }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+frame-support-test = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 trie-db = "0.22.3"
 serde_json = "1.0.61"
 libsecp256k1 = "0.3.5"
diff --git a/runtime/kusama/Cargo.toml b/runtime/kusama/Cargo.toml
index c8ba35aba177..94a149a0608f 100644
--- a/runtime/kusama/Cargo.toml
+++ b/runtime/kusama/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 }
-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-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", branch = "a-sync-fix", default-features = false }
+babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-staking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-session = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-version = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-npos-elections = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", 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-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-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-randomness-collective-flip = { 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-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-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", branch = "a-sync-fix", default-features = false }
+pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+frame-executive = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-nicks = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-session = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-society = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+frame-system = {git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", 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 }
-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", branch = "a-sync-fix", default-features = false, optional = true }
+frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false, optional = true }
+pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false, optional = true }
+pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false, optional = true }
+frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false, optional = true }
 hex-literal = { version = "0.3.1", optional = true }
 
 runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
@@ -82,8 +82,8 @@ primitives = { package = "polkadot-primitives", path = "../../primitives", defau
 hex-literal = "0.3.1"
 libsecp256k1 = "0.3.5"
 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 = "a-sync-fix" }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 separator = "0.4.1"
 serde_json = "1.0.61"
 
diff --git a/runtime/parachains/Cargo.toml b/runtime/parachains/Cargo.toml
index d760b37eb694..9cce98cea430 100644
--- a/runtime/parachains/Cargo.toml
+++ b/runtime/parachains/Cargo.toml
@@ -12,27 +12,27 @@ rustc-hex = { version = "2.1.0", default-features = false }
 serde = { version = "1.0.123", features = [ "derive" ], optional = true }
 derive_more = "0.99.11"
 
-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", branch = "a-sync-fix", default-features = false }
+inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-session = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-staking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", optional = true }
 
-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", branch = "a-sync-fix", default-features = false }
+pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-session = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+frame-system = {git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false, optional = true }
 
 xcm = { package = "xcm", path = "../../xcm", default-features = false }
 xcm-executor = { package = "xcm-executor", path = "../../xcm/xcm-executor", default-features = false }
@@ -45,18 +45,18 @@ rand_chacha = { version = "0.3.0", default-features = false }
 [dev-dependencies]
 futures = "0.3.12"
 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" }
-frame-support-test = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-randomness-collective-flip = { 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" }
+keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+frame-support-test = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 serde_json = "1.0.61"
 libsecp256k1 = "0.3.5"
-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", branch = "a-sync-fix", default-features = false }
+sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix"}
 
 
 [features]
diff --git a/runtime/polkadot/Cargo.toml b/runtime/polkadot/Cargo.toml
index 865503b49c1d..32ad6e06359d 100644
--- a/runtime/polkadot/Cargo.toml
+++ b/runtime/polkadot/Cargo.toml
@@ -15,62 +15,62 @@ 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 }
-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", branch = "a-sync-fix", default-features = false }
+babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-staking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-session = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-version = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-npos-elections = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", 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-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-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-randomness-collective-flip = { 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 }
+pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+frame-executive = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-nicks = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-session = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+frame-system = {git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", 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", branch = "a-sync-fix", default-features = false, optional = true }
+frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false, optional = true }
+frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false, optional = true }
+pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false, optional = true }
+pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false, optional = true }
 hex-literal = { version = "0.3.1", optional = true }
 
 runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
@@ -80,8 +80,8 @@ primitives = { package = "polkadot-primitives", path = "../../primitives", defau
 hex-literal = "0.3.1"
 libsecp256k1 = "0.3.5"
 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 = "a-sync-fix" }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 trie-db = "0.22.3"
 serde_json = "1.0.61"
 separator = "0.4.1"
diff --git a/runtime/rococo/Cargo.toml b/runtime/rococo/Cargo.toml
index 7dc9b24de56b..2d427bcaae9f 100644
--- a/runtime/rococo/Cargo.toml
+++ b/runtime/rococo/Cargo.toml
@@ -13,42 +13,42 @@ 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", branch = "a-sync-fix", default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-session = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-staking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-version = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", 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 }
-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 = "a-sync-fix", default-features = false }
+block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", 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-sudo = { 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 }
-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 }
-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-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-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" }
-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-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 }
-authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-session = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+frame-executive = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", 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 }
+frame-system = {git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
 
 runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
 primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
diff --git a/runtime/test-runtime/Cargo.toml b/runtime/test-runtime/Cargo.toml
index 9cb7e198e6b7..38e5762ab22a 100644
--- a/runtime/test-runtime/Cargo.toml
+++ b/runtime/test-runtime/Cargo.toml
@@ -14,43 +14,43 @@ 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 }
-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", branch = "a-sync-fix", default-features = false }
+babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-staking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-session = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-version = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+frame-election-provider-support = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", 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-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-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-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 }
-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", branch = "a-sync-fix", default-features = false }
+pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+frame-executive = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-nicks = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-session = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+frame-system = {git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
 
 runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
 primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
@@ -61,8 +61,8 @@ polkadot-runtime-parachains = { path = "../parachains", default-features = false
 hex-literal = "0.3.1"
 libsecp256k1 = "0.3.5"
 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 = "a-sync-fix" }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 serde_json = "1.0.61"
 
 [build-dependencies]
diff --git a/runtime/westend/Cargo.toml b/runtime/westend/Cargo.toml
index 6760162e224d..668fda7c02df 100644
--- a/runtime/westend/Cargo.toml
+++ b/runtime/westend/Cargo.toml
@@ -15,63 +15,63 @@ 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 }
-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", branch = "a-sync-fix", default-features = false }
+babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-staking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-session = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-version = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-npos-elections = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", 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-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 = { 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 }
-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-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-randomness-collective-flip = { 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-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 }
-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-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", branch = "a-sync-fix", default-features = false }
+pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+frame-executive = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-nicks = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-session = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-society = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
+pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+frame-system = {git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", 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", branch = "a-sync-fix", default-features = false, optional = true }
+frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false, optional = true }
+frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false, optional = true }
+pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false, optional = true }
+pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false, optional = true }
 hex-literal = { version = "0.3.1", optional = true }
 
 runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
@@ -83,8 +83,8 @@ runtime-parachains = { package = "polkadot-runtime-parachains", path = "../parac
 hex-literal = "0.3.1"
 libsecp256k1 = "0.3.5"
 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 = "a-sync-fix" }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix" }
 serde_json = "1.0.61"
 
 [build-dependencies]
diff --git a/statement-table/Cargo.toml b/statement-table/Cargo.toml
index 6589cc172a0b..fcf360f13eab 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 = "a-sync-fix" }
 primitives = { package = "polkadot-primitives", path = "../primitives" }
diff --git a/xcm/xcm-builder/Cargo.toml b/xcm/xcm-builder/Cargo.toml
index 6cf2959d9dce..c3a9ca434889 100644
--- a/xcm/xcm-builder/Cargo.toml
+++ b/xcm/xcm-builder/Cargo.toml
@@ -9,11 +9,11 @@ version = "0.8.30"
 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 }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
 
 # Polkadot dependencies
 polkadot-parachain = { path = "../../parachain", default-features = false }
diff --git a/xcm/xcm-executor/Cargo.toml b/xcm/xcm-executor/Cargo.toml
index b1d5e1ff94d1..32174fe568e6 100644
--- a/xcm/xcm-executor/Cargo.toml
+++ b/xcm/xcm-executor/Cargo.toml
@@ -9,12 +9,12 @@ version = "0.8.30"
 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", branch = "a-sync-fix", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "a-sync-fix", default-features = false }
 log = { version = "0.4.14", default-features = false }
 
 [features]