Change Details

Backport of core#20692 and core#20737.

Backport of [[https://github.com/bitcoin/bitcoin/pull/20692 | core#20692]] and [[https://github.com/bitcoin/bitcoin/pull/20737 | core#20737]].

Backport of core#20692 and core#20737[[https://github.com/bitcoin/bitcoin/pull/20692 | core#20692]] and [[https://github.com/bitcoin/bitcoin/pull/20737 | core#20737]].