Change Details

Partial backport of core#25445: https://github.com/bitcoin/bitcoin/pull/25445/commits/fa04ff61b6c209e48bce7d581466356e84617637 This commit was previously skipped due to out of order backports.

Partial backport of [[https://github.com/bitcoin/bitcoin/pull/25445 | core#25445]]: https://github.com/bitcoin/bitcoin/pull/25445/commits/fa04ff61b6c209e48bce7d581466356e84617637 This commit was previously skipped due to out of order backports.

Partial backport of [[https://github.com/bitcoin/bitcoin/pull/25445 | core#25445:]]: https://github.com/bitcoin/bitcoin/pull/25445/commits/fa04ff61b6c209e48bce7d581466356e84617637 This commit was previously skipped due to out of order backports.