diff --git a/contrib/aur/bitcoin-abc-qt/PKGBUILD b/contrib/aur/bitcoin-abc-qt/PKGBUILD
index 9b989db09..fcf27599b 100644
--- a/contrib/aur/bitcoin-abc-qt/PKGBUILD
+++ b/contrib/aur/bitcoin-abc-qt/PKGBUILD
@@ -1,103 +1,103 @@
 # Maintainer: Josh Ellithorpe <quest@mac.com>
 
 pkgname=bitcoin-abc-qt
-pkgver=0.22.6
+pkgver=0.22.7
 pkgrel=0
 pkgdesc="Bitcoin ABC (ABC network) with bitcoind, bitcoin-cli, bitcoin-tx, bitcoin-seeder and bitcoin-qt"
 arch=('i686' 'x86_64')
 url="https://bitcoinabc.org"
 depends=('boost-libs' 'libevent' 'desktop-file-utils' 'qt5-base' 'protobuf' 'openssl' 'miniupnpc' 'zeromq' 'qrencode' 'jemalloc')
 makedepends=('cmake' 'ninja' 'boost' 'qt5-tools' 'python' 'help2man' 'xorg-server-xvfb')
 license=('MIT')
 source=(https://github.com/Bitcoin-ABC/bitcoin-abc/archive/v$pkgver.tar.gz
         bitcoin.conf
         bitcoin.logrotate
         bitcoin.service
         bitcoin-reindex.service
         bitcoin.install)
 backup=('etc/bitcoin/bitcoin.conf'
         'etc/logrotate.d/bitcoin')
 provides=('bitcoin-cli' 'bitcoin-daemon' 'bitcoin-tx' 'bitcoin-qt' 'bitcoin-seeder' 'bitcoin-wallet')
 conflicts=('bitcoin-cli' 'bitcoin-daemon' 'bitcoin-tx' 'bitcoin-qt' 'bitcoin-seeder' 'bitcoin-wallet')
 install=bitcoin.install
 
 build() {
   cd "$srcdir/bitcoin-abc-$pkgver"
 
   msg2 'Building...'
   mkdir -p build
   pushd build
 
   cmake -GNinja .. \
     -DENABLE_CLANG_TIDY=OFF \
     -DCLIENT_VERSION_IS_RELEASE=ON \
     -DENABLE_REDUCE_EXPORTS=ON \
     -DENABLE_STATIC_LIBSTDCXX=ON \
     -DCMAKE_INSTALL_PREFIX=$pkgdir/usr
 
   ninja
   popd
 }
 
 check() {
   cd "$srcdir/bitcoin-abc-$pkgver/build"
 
   msg2 'Testing...'
   ninja check
 }
 
 package() {
   cd "$srcdir/bitcoin-abc-$pkgver"
 
   msg2 'Installing desktop shortcut...'
   install -Dm644 contrib/debian/bitcoin-qt.desktop \
     "$pkgdir"/usr/share/applications/bitcoin.desktop
   install -Dm644 share/pixmaps/bitcoin-abc128.png \
     "$pkgdir"/usr/share/pixmaps/bitcoin-abc128.png
 
   msg2 'Installing license...'
   install -Dm 644 COPYING -t "$pkgdir/usr/share/licenses/${pkgname}"
 
   msg2 'Installing examples...'
   install -Dm644 "contrib/debian/examples/bitcoin.conf" \
     -t "$pkgdir/usr/share/doc/bitcoin/examples"
 
   msg2 'Installing documentation...'
   install -dm 755 "$pkgdir/usr/share/doc/bitcoin"
   for _doc in \
     $(find doc -maxdepth 1 -type f -name "*.md" -printf '%f\n') \
     release-notes; do
       cp -dpr --no-preserve=ownership "doc/$_doc" \
         "$pkgdir/usr/share/doc/bitcoin/$_doc"
   done
 
   msg2 'Installing essential directories'
   install -dm 700 "$pkgdir/etc/bitcoin"
   install -dm 755 "$pkgdir/srv/bitcoin"
   install -dm 755 "$pkgdir/run/bitcoin"
 
   pushd build
   msg2 'Installing executables...'
   ninja install/strip
 
   msg2 'Installing man pages...'
   xvfb-run ninja install-manpages
   popd
 
   msg2 'Installing bitcoin.conf...'
   install -Dm 600 "$srcdir/bitcoin.conf" -t "$pkgdir/etc/bitcoin"
 
   msg2 'Installing bitcoin.service...'
   install -Dm 644 "$srcdir/bitcoin.service" -t "$pkgdir/usr/lib/systemd/system"
   install -Dm 644 "$srcdir/bitcoin-reindex.service" \
     -t "$pkgdir/usr/lib/systemd/system"
 
   msg2 'Installing bitcoin.logrotate...'
   install -Dm 644 "$srcdir/bitcoin.logrotate" "$pkgdir/etc/logrotate.d/bitcoin"
 
   msg2 'Installing bash completion...'
   for _compl in bitcoin-cli bitcoin-tx bitcoind; do
     install -Dm 644 "contrib/${_compl}.bash-completion" \
       "$pkgdir/usr/share/bash-completion/completions/$_compl"
   done
 }
diff --git a/contrib/aur/bitcoin-abc/PKGBUILD b/contrib/aur/bitcoin-abc/PKGBUILD
index 081b5ece7..f9d0a6c50 100644
--- a/contrib/aur/bitcoin-abc/PKGBUILD
+++ b/contrib/aur/bitcoin-abc/PKGBUILD
@@ -1,99 +1,99 @@
 # Maintainer: Josh Ellithorpe <quest@mac.com>
 
 pkgname=bitcoin-abc
-pkgver=0.22.6
+pkgver=0.22.7
 pkgrel=0
 pkgdesc="Bitcoin ABC (ABC network) with bitcoind, bitcoin-tx, bitcoin-seeder and bitcoin-cli"
 arch=('i686' 'x86_64')
 url="https://bitcoinabc.org"
 depends=('boost-libs' 'libevent' 'openssl' 'zeromq' 'miniupnpc' 'jemalloc')
 makedepends=('cmake' 'ninja' 'boost' 'python' 'help2man')
 license=('MIT')
 source=(https://github.com/Bitcoin-ABC/bitcoin-abc/archive/v$pkgver.tar.gz
         bitcoin.conf
         bitcoin.logrotate
         bitcoin.service
         bitcoin-reindex.service
         bitcoin.install)
 backup=('etc/bitcoin/bitcoin.conf'
         'etc/logrotate.d/bitcoin')
 provides=('bitcoin-cli' 'bitcoin-daemon' 'bitcoin-tx' 'bitcoin-seeder')
 conflicts=('bitcoin-cli' 'bitcoin-daemon' 'bitcoin-tx' 'bitcoin-seeder')
 install=bitcoin.install
 
 build() {
   cd "$srcdir/${pkgname}-$pkgver"
 
   msg2 'Building...'
   mkdir -p build
   pushd build
 
   cmake -GNinja .. \
     -DENABLE_CLANG_TIDY=OFF \
     -DCLIENT_VERSION_IS_RELEASE=ON \
     -DENABLE_REDUCE_EXPORTS=ON \
     -DENABLE_STATIC_LIBSTDCXX=ON \
     -DBUILD_BITCOIN_WALLET=OFF \
     -DBUILD_BITCOIN_QT=OFF \
     -DCMAKE_INSTALL_PREFIX=$pkgdir/usr
 
   ninja
   popd
 }
 
 check() {
   cd "$srcdir/${pkgname}-$pkgver/build"
 
   msg2 'Testing...'
   ninja check
 }
 
 package() {
   cd "$srcdir/${pkgname}-$pkgver"
 
   msg2 'Installing license...'
   install -Dm 644 COPYING -t "$pkgdir/usr/share/licenses/${pkgname}"
 
   msg2 'Installing examples...'
   install -Dm644 "contrib/debian/examples/bitcoin.conf" \
     -t "$pkgdir/usr/share/doc/bitcoin/examples"
 
   msg2 'Installing documentation...'
   install -dm 755 "$pkgdir/usr/share/doc/bitcoin"
   for _doc in \
     $(find doc -maxdepth 1 -type f -name "*.md" -printf '%f\n') \
     release-notes; do
       cp -dpr --no-preserve=ownership "doc/$_doc" \
         "$pkgdir/usr/share/doc/bitcoin/$_doc"
   done
 
   msg2 'Installing essential directories'
   install -dm 700 "$pkgdir/etc/bitcoin"
   install -dm 755 "$pkgdir/srv/bitcoin"
   install -dm 755 "$pkgdir/run/bitcoin"
 
   pushd build
   msg2 'Installing executables...'
   ninja install/strip
 
   msg2 'Installing man pages...'
   ninja install-manpages
   popd
 
   msg2 'Installing bitcoin.conf...'
   install -Dm 600 "$srcdir/bitcoin.conf" -t "$pkgdir/etc/bitcoin"
 
   msg2 'Installing bitcoin.service...'
   install -Dm 644 "$srcdir/bitcoin.service" -t "$pkgdir/usr/lib/systemd/system"
   install -Dm 644 "$srcdir/bitcoin-reindex.service" \
     -t "$pkgdir/usr/lib/systemd/system"
 
   msg2 'Installing bitcoin.logrotate...'
   install -Dm 644 "$srcdir/bitcoin.logrotate" "$pkgdir/etc/logrotate.d/bitcoin"
 
   msg2 'Installing bash completion...'
   for _compl in bitcoin-cli bitcoin-tx bitcoind; do
     install -Dm 644 "contrib/${_compl}.bash-completion" \
       "$pkgdir/usr/share/bash-completion/completions/$_compl"
   done
 }
diff --git a/contrib/teamcity/build-configurations.yml b/contrib/teamcity/build-configurations.yml
index e2ad02e75..c9237c963 100644
--- a/contrib/teamcity/build-configurations.yml
+++ b/contrib/teamcity/build-configurations.yml
@@ -1,429 +1,449 @@
 ---
 # Templates can be referenced in builds to avoid duplication
 templates:
   gitian_builds:
     script: contrib/teamcity/gitian.sh
     timeout: 7200
     artifacts:
       gitian-results: ''
 
   check+secp256k1:
     targets:
       - - all
         - install
         - install-secp256k1
       - - check
         - check-secp256k1
         - check-functional
 
   secp256k1:
     Werror: true
     targets:
       - - secp256k1
         - install-secp256k1
       - - check-secp256k1
 
+  ibd:
+    targets:
+      - - bitcoind
+    post_build: |
+      "${TOPLEVEL}/contrib/teamcity/ibd.sh" -disablewallet -debug=net
+    timeout: 14400
+    artifacts:
+      ibd/debug.log: log/debug.log
+
+  ibd-no-assumevalid-checkpoint:
+    targets:
+      - - bitcoind
+    post_build: |
+      "${TOPLEVEL}/contrib/teamcity/ibd.sh" -disablewallet -assumevalid=0 -checkpoints=0 -debug=net
+    timeout: 21600
+    artifacts:
+      ibd/debug.log: log/debug.log
+
 # The build descriptions.
 # If a script is defined, then this will be the only step to run.
 # Otherwise a list of targets can be specified, grouped by parallel runs.
 # Example:
 #   targets:
 #     - - build11
 #       - build12
 #     - - build21
 #       - build22
 # Will run:
 #   ninja build11 build12
 #   ninja build21 build22
 builds:
   build-asan:
     Werror: true
     clang: true
     fail_fast: true
     cmake_flags:
       - '-DCMAKE_CXX_FLAGS=-DARENA_DEBUG'
       - '-DCRYPTO_USE_ASM=OFF'
       - '-DENABLE_SANITIZERS=address'
     templates:
       - check+secp256k1
     timeout: 2400
     env:
       ASAN_OPTIONS: log_path=stdout
       LSAN_OPTIONS: log_path=stdout
 
   build-bench:
     Werror: true
     cmake_flags:
       - '-DSECP256K1_ENABLE_MODULE_ECDH=ON'
       - '-DSECP256K1_ENABLE_MODULE_MULTISET=ON'
     targets:
       - - all
         - install-bitcoin-bench
         - install-secp256k1-bench
       - - bench-bitcoin
       - - bench-secp256k1
     timeout: 1200
 
   build-clang:
     runOnDiff: true
     Werror: true
     clang: true
     targets:
       - - all
         - install
         - install-secp256k1
       - - check
         - check-secp256k1
     timeout: 1200
 
   build-clang-tidy:
     runOnDiff: true
     clang: true
     cmake_flags:
       - '-DENABLE_CLANG_TIDY=ON'
     targets:
       - - all
       - - check
     timeout: 1800
 
   build-coverage:
     gcc: true
     cmake_flags:
       - '-DENABLE_COVERAGE=ON'
       - '-DENABLE_BRANCH_COVERAGE=ON'
     targets:
       - - coverage-check-extended
     post_build: |
       "${TOPLEVEL}/contrib/teamcity/upload-coverage.sh" check-extended
     timeout: 4800
     artifacts:
       coverage.tar.gz: coverage.tar.gz
 
   build-debug:
     runOnDiff: true
     Werror: true
     cmake_flags:
       - '-DCMAKE_BUILD_TYPE=Debug'
     templates:
       - check+secp256k1
     timeout: 1200
 
   build-diff:
     runOnDiff: true
     Werror: true
     targets:
       - - all
         - install
         - install-secp256k1
       - - check-all
         - check-upgrade-activated
     timeout: 1200
 
   build-docs:
     targets:
       - - doc-rpc
         - doc-doxygen
     post_build: |
       xvfb-run -a -e /dev/stderr ninja install-manpages-html
     timeout: 600
     artifacts:
       doc/*: doc
 
   build-ibd:
-    targets:
-      - - bitcoind
-    post_build: |
-      "${TOPLEVEL}/contrib/teamcity/ibd.sh" -disablewallet -debug=net
-    timeout: 14400
-    artifacts:
-      ibd/debug.log: log/debug.log
+    templates:
+      - ibd
+
+  build-ibd-bchn:
+    cmake_flags:
+      - '-DNETWORK_COMPATIBILITY=BCHN'
+    templates:
+      - ibd
 
   build-ibd-no-assumevalid-checkpoint:
-    targets:
-      - - bitcoind
-    post_build: |
-      "${TOPLEVEL}/contrib/teamcity/ibd.sh" -disablewallet -assumevalid=0 -checkpoints=0 -debug=net
-    timeout: 21600
-    artifacts:
-      ibd/debug.log: log/debug.log
+    templates:
+      - ibd-no-assumevalid-checkpoint
+
+  build-ibd-no-assumevalid-checkpoint-bchn:
+    cmake_flags:
+      - '-DNETWORK_COMPATIBILITY=BCHN'
+    templates:
+      - ibd-no-assumevalid-checkpoint
 
   build-linux32:
     cross_build:
       static_depends: linux32
       toolchain: Linux32
     templates:
       - check+secp256k1
     timeout: 3600
 
   build-linux64:
     cross_build:
       static_depends: linux64
       toolchain: Linux64
     templates:
       - check+secp256k1
     timeout: 3600
 
   build-linux-aarch64:
     cross_build:
       static_depends: linux-aarch64
       toolchain: LinuxAArch64
       emulator: qemu-aarch64-static
     cmake_flags:
       # The ZMQ functional test will fail with qemu (due to a qemu limitation),
       # so disable it to avoid the failure.
       # Extracted from stderr:
       #   Unknown host QEMU_IFLA type: 50
       #   Unknown host QEMU_IFLA type: 51
       #   Unknown QEMU_IFLA_BRPORT type 33
       - "-DBUILD_BITCOIN_ZMQ=OFF"
       # This is an horrible hack to workaround a qemu bug:
       # https://bugs.launchpad.net/qemu/+bug/1748612
       # Qemu emits a message for unsupported features called by the guest.
       # Because the output filtering is not working at all, it causes the
       # qemu stderr to end up in the node stderr and fail the functional
       # tests.
       # Disabling the unsupported feature (here bypassing the config
       # detection) fixes the issue.
       # FIXME: get rid of the hack, either by using a better qemu version
       # or by filtering stderr at the framework level.
       - "-DHAVE_DECL_GETIFADDRS=OFF"
     templates:
       - check+secp256k1
     timeout: 3600
     env:
       QEMU_LD_PREFIX: /usr/aarch64-linux-gnu
 
   build-linux-arm:
     cross_build:
       static_depends: linux-arm
       toolchain: LinuxARM
       emulator: qemu-arm-static
     cmake_flags:
       # The ZMQ functional test will fail with qemu (due to a qemu limitation),
       # so disable it to avoid the failure.
       # Extracted from stderr:
       #   Unknown host QEMU_IFLA type: 50
       #   Unknown host QEMU_IFLA type: 51
       #   Unknown QEMU_IFLA_BRPORT type 33
       - "-DBUILD_BITCOIN_ZMQ=OFF"
       # This is an horrible hack to workaround a qemu bug:
       # https://bugs.launchpad.net/qemu/+bug/1748612
       # Qemu emits a message for unsupported features called by the guest.
       # Because the output filtering is not working at all, it causes the
       # qemu stderr to end up in the node stderr and fail the functional
       # tests.
       # Disabling the unsupported feature (here bypassing the config
       # detection) fixes the issue.
       # FIXME: get rid of the hack, either by using a better qemu version
       # or by filtering stderr at the framework level.
       - "-DHAVE_DECL_GETIFADDRS=OFF"
     templates:
       - check+secp256k1
     timeout: 3600
     env:
       QEMU_LD_PREFIX: /usr/arm-linux-gnueabihf
 
   build-make-generator:
     generator:
       name: 'Unix Makefiles'
       command: make
       flags:
         - '-k'
     templates:
       - check+secp256k1
     timeout: 1200
 
   build-master:
     Werror: true
     targets:
       - - all
         - install
         - install-secp256k1
       - - check-extended
         - check-upgrade-activated-extended
     timeout: 4800
 
   build-native-osx:
     templates:
       - check+secp256k1
     timeout: 3600
 
   build-osx:
     cross_build:
       static_depends: osx
       toolchain: OSX
     targets:
       - - all
         - install
         - install-secp256k1
         - install-tests
     post_build: |
       export PYTHONPATH="${TOPLEVEL}/depends/x86_64-apple-darwin16/native/lib/python3/dist-packages:${PYTHONPATH:-}"
       ninja osx-dmg
     timeout: 3600
     artifacts:
       Bitcoin-ABC.dmg: Bitcoin-ABC.dmg
 
   build-secp256k1:
     cmake_flags:
       - '-DSECP256K1_ENABLE_MODULE_ECDH=ON'
       - '-DSECP256K1_ENABLE_MODULE_MULTISET=ON'
     templates:
       - secp256k1
     timeout: 600
 
   build-secp256k1-java:
     cmake_flags:
       - '-DSECP256K1_ENABLE_MODULE_ECDH=ON'
       - '-DSECP256K1_ENABLE_JNI=ON'
       - '-DUSE_JEMALLOC=OFF'
     templates:
       - secp256k1
     timeout: 600
 
   build-tsan:
     Werror: true
     clang: true
     fail_fast: true
     cmake_flags:
       - '-DENABLE_SANITIZERS=thread'
     targets:
       - - all
         - install
       - - check
         - check-functional
     timeout: 2400
     env:
       TSAN_OPTIONS: log_path=stdout
 
   build-ubsan:
     Werror: true
     clang: true
     fail_fast: true
     cmake_flags:
       - '-DENABLE_SANITIZERS=undefined'
     templates:
       - check+secp256k1
     timeout: 2400
     env:
       UBSAN_OPTIONS: log_path=stdout
 
   build-win64:
     cross_build:
       static_depends: win64
       toolchain: Win64
     cmake_flags:
       - "-DBUILD_BITCOIN_SEEDER=OFF"
       - "-DCPACK_STRIP_FILES=ON"
       - "-DUSE_JEMALLOC=OFF"
     targets:
       - - all
         - install
         - install-secp256k1
         - install-tests
       - - package
     post_build: |
       wine "${ARTIFACT_DIR}/bin/test_bitcoin.exe" --run_test=\!radix_tests,rcu_tests
     timeout: 3600
     artifacts:
       bitcoin-abc-*-x86_64-w64-mingw32.exe: bitcoin-abc-x86_64-w64-mingw32.exe
 
   build-without-bip70:
     Werror: true
     cmake_flags:
       - '-DENABLE_BIP70=OFF'
     targets:
       - - all
         - install
       - - check
         - check-functional
     timeout: 1800
 
   build-without-cli:
     Werror: true
     cmake_flags:
       - '-DBUILD_BITCOIN_CLI=OFF'
     targets:
       - - all
         - install
       - - check-functional
     timeout: 1200
 
   build-without-qt:
     Werror: true
     cmake_flags:
       - '-DBUILD_BITCOIN_QT=OFF'
     targets:
       - - all
         - install
       - - check
     timeout: 1200
 
   build-without-wallet:
     runOnDiff: true
     Werror: true
     cmake_flags:
       - '-DBUILD_BITCOIN_WALLET=OFF'
     targets:
       - - all
         - install
       - - check
         - check-functional
     timeout: 1200
 
   build-without-zmq:
     Werror: true
     cmake_flags:
       - '-DBUILD_BITCOIN_ZMQ=OFF'
     targets:
       - - all
         - install
       - - check
         - check-functional
     timeout: 1800
 
   check-buildbot:
     targets:
       - - check-buildbot
     timeout: 600
 
   check-seeds:
     targets:
       - - bitcoind
         - bitcoin-cli
     post_build: |
       # Run on different ports to avoid a race where the rpc port used in the first run
       # may not be closed in time for the second to start.
       SEEDS_DIR="${TOPLEVEL}"/contrib/seeds
       RPC_PORT=18832 "${SEEDS_DIR}"/check-seeds.sh main 80
       RPC_PORT=18833 "${SEEDS_DIR}"/check-seeds.sh test 70
     timeout: 600
 
   check-source-control-tools:
     cmake_flags:
       - '-DENABLE_SOURCE_CONTROL_TOOLS_TESTS=ON'
     targets:
       - - check-source-control-tools
     timeout: 600
 
   gitian-linux:
     templates:
       - gitian_builds
     env:
       OS_NAME: linux
 
   gitian-osx:
     templates:
       - gitian_builds
     env:
       OS_NAME: osx
 
   gitian-win:
     templates:
       - gitian_builds
     env:
       OS_NAME: win
 
   lint-circular-dependencies:
     runOnDiff: true
     script: test/lint/lint-circular-dependencies.sh