Change Details

This is a backport of core#28902 and core#28962

This is a backport of [[https://github.com/bitcoin/bitcoin/pull/28902 | core#28902]] and [[https://github.com/bitcoin/bitcoin/pull/28962 | core#28962]]

This is a backport of core#28902 and core#28962[[https://github.com/bitcoin/bitcoin/pull/28902 | core#28902]] and [[https://github.com/bitcoin/bitcoin/pull/28962 | core#28962]]