Change Details

This is a partial backport of core#25717 https://github.com/bitcoin/bitcoin/pull/25717/commits/03712dddfbb9fe0dc7a2ead53c65106189f5c803 Depends on D15166

This is a partial backport of [[https://github.com/bitcoin/bitcoin/pull/25717 | core#25717]] https://github.com/bitcoin/bitcoin/pull/25717/commits/03712dddfbb9fe0dc7a2ead53c65106189f5c803 Depends on D15166

This is a partial backport of [[https://github.com/bitcoin/bitcoin/pull/25717 | core#25717]] https://github.com/bitcoin/bitcoin/pull/25717/commits/03712dddfbb9fe0dc7a2ead53c65106189f5c803 Depends on D15166