Change Details

Partial backport of core PR15773: https://github.com/bitcoin/bitcoin/pull/15773/commits/fafe008cb407cd3830b0ae25a4e9f4400ff66b6e

Partial backport of core [[https://github.com/bitcoin/bitcoin/pull/15773 | PR15773]]: https://github.com/bitcoin/bitcoin/pull/15773/commits/fafe008cb407cd3830b0ae25a4e9f4400ff66b6e

Partial backport of core [[https://github.com/bitcoin/bitcoin/pull/15773 | PR15773:]]: https://github.com/bitcoin/bitcoin/pull/15773/commits/fafe008cb407cd3830b0ae25a4e9f4400ff66b6e