Change Details

Partial backport 1/7 of core PR16202: https://github.com/bitcoin/bitcoin/pull/16202/commits/6294ecdb8bb4eb7049a18c721ee8cb4a53d80a06 Adapted to match our codebase.

Partial backport 1/7 of core [[https://github.com/bitcoin/bitcoin/pull/16202 | PR16202]]: https://github.com/bitcoin/bitcoin/pull/16202/commits/6294ecdb8bb4eb7049a18c721ee8cb4a53d80a06 Adapted to match our codebase.

Partial backport 1/7 of core [[https://github.com/bitcoin/bitcoin/pull/16202 | PR16202:]]: https://github.com/bitcoin/bitcoin/pull/16202/commits/6294ecdb8bb4eb7049a18c721ee8cb4a53d80a06 Adapted to match our codebase.