Change Details

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

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

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