Change Details

Partial backport of core PR17270: https://github.com/bitcoin/bitcoin/pull/17270/commits/cea3902015185adc88adbd031d919f91bc844fd7

Partial backport of core [[https://github.com/bitcoin/bitcoin/pull/17270 | PR17270]]: https://github.com/bitcoin/bitcoin/pull/17270/commits/cea3902015185adc88adbd031d919f91bc844fd7

Partial backport of core [[https://github.com/bitcoin/bitcoin/pull/17270 | PR17270:]]: https://github.com/bitcoin/bitcoin/pull/17270/commits/cea3902015185adc88adbd031d919f91bc844fd7