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/5e78c5734bb0c9aae7b0a7019a745b2d7059b3d9
Depends on D6727