Change Details

Backport of core#28422 and core#28630. Depends on D17209.

Backport of [[https://github.com/bitcoin/bitcoin/pull/28422 | core#28422]] and [[https://github.com/bitcoin/bitcoin/pull/28630 | core#28630]]. Depends on D17209.

Backport of core#28422 and core#28630[[https://github.com/bitcoin/bitcoin/pull/28422 | core#28422]] and [[https://github.com/bitcoin/bitcoin/pull/28630 | core#28630]]. Depends on D17209.