Change Details

Partial backport of core#23280: https://github.com/bitcoin/bitcoin/pull/23280/commits/ca7c0b934db68acdc410e3a82f1ed898382da2e5 Depends on D12569.

Partial backport of [[https://github.com/bitcoin/bitcoin/pull/23280 | core#23280]]: https://github.com/bitcoin/bitcoin/pull/23280/commits/ca7c0b934db68acdc410e3a82f1ed898382da2e5 Depends on D12569.

Partial backport of [[https://github.com/bitcoin/bitcoin/pull/23280 | core#23280:]]: https://github.com/bitcoin/bitcoin/pull/23280/commits/ca7c0b934db68acdc410e3a82f1ed898382da2e5 Depends on D12569.