Change Details

Partial backport of core#22740: https://github.com/bitcoin/bitcoin/pull/22740/commits/1622543cf42feb810d8ea9e7b3238d21f1427c17

Partial backport of [[https://github.com/bitcoin/bitcoin/pull/22740 | core#22740]]: https://github.com/bitcoin/bitcoin/pull/22740/commits/1622543cf42feb810d8ea9e7b3238d21f1427c17

Partial backport of [[https://github.com/bitcoin/bitcoin/pull/22740 | core#22740:]]: https://github.com/bitcoin/bitcoin/pull/22740/commits/1622543cf42feb810d8ea9e7b3238d21f1427c17