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/c8b0d22698385f91215ce8145631e3d5826dc977
Depends on D6698