This is a partial backport of [[https://github.com/bitcoin/bitcoin/pull/24931 | core#24931]]
https://github.com/bitcoin/bitcoin/pull/24931/commits/f24bd45b37e1b2d19e5a053dbfefa30306c1d41a
https://github.com/bitcoin/bitcoin/pull/24931/commits/be6aa72f9f8d50b6b5b19b319a74abe7ab4099ff
Depends on D14890