Change Details

Partial backport 1/3 of core PR17399: https://github.com/bitcoin/bitcoin/pull/17399/commits/0aed17ef2892478c28cd660e53223c6dd1dc0187

Partial backport 1/3 of core [[https://github.com/bitcoin/bitcoin/pull/17399 | PR17399]]: https://github.com/bitcoin/bitcoin/pull/17399/commits/0aed17ef2892478c28cd660e53223c6dd1dc0187

Partial backport 1/3 of core [[https://github.com/bitcoin/bitcoin/pull/17399 | PR17399:]]: https://github.com/bitcoin/bitcoin/pull/17399/commits/0aed17ef2892478c28cd660e53223c6dd1dc0187