Change Details

Backport of core#25430 and core#26414.

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

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