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