Co-authored-by: Anthony Towns <aj@erisian.com.au>
This is a partial backport of Core [[https://github.com/bitcoin/bitcoin/pull/15141 | PR15141]] : https://github.com/bitcoin/bitcoin/pull/15141/commits/7df16e70e67c753c871797ce947ea09d7cb0e519
Depends on D6698