Change Details

Partial backport of core#23280: https://github.com/bitcoin/bitcoin/pull/23280/commits/975235ca0a8f5bcf9df880698b3b0d4bbde9f7fb Depends on D12567.

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

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