Change Details

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

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

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