This is a partial backport of [[https://github.com/bitcoin/bitcoin/pull/26140 | core#26140]]
https://github.com/bitcoin/bitcoin/pull/26140/commits/938a8e2566bf2f819adeb75a08c0c8ba9a85fe1c
https://github.com/bitcoin/bitcoin/pull/26140/commits/279c53d7e4e920d3d09da74689761a2961b1a636
Depends on D15291