Change Details

Partial backport of core#23280: https://github.com/bitcoin/bitcoin/pull/23280/commits/2414ebc18b8bebf79c47e58a4293d0fc6420a811

Partial backport of [[https://github.com/bitcoin/bitcoin/pull/23280 | core#23280]]: https://github.com/bitcoin/bitcoin/pull/23280/commits/2414ebc18b8bebf79c47e58a4293d0fc6420a811

Partial backport of [[https://github.com/bitcoin/bitcoin/pull/23280 | core#23280:]]: https://github.com/bitcoin/bitcoin/pull/23280/commits/2414ebc18b8bebf79c47e58a4293d0fc6420a811