Co-authored-by: João Barbosa <joao.paulo.barbosa@gmail.com>
Co-authored-by: Ryan Ofsky <ryan@ofsky.org>
Co-authored-by: Andreas Kouloumos <kouloumosa@gmail.com>
This is a backport of [[https://github.com/bitcoin/bitcoin/pull/24865 | core#24865]]
Depends on D17920