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/12dbdd7a41bac73e51ed8f7b290b7671196bf9ea
Depends on D6734 and D6736