Change Details

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

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

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