Co-Authored-By: John Newbery <john@johnnewbery.com>
This is a backport of Core [[https://github.com/bitcoin/bitcoin/pull/18808 | PR18808]] [2/4]
https://github.com/bitcoin/bitcoin/pull/18808/commits/e257cf71c851e25e1a533bf1d4296f6b55c81332
Depends on D9084