Change Details

This is a partial backport of core#23474: https://github.com/bitcoin/bitcoin/pull/23474/commits/fad13991aea6463ecf07dd907de1c1b23837d7e7

This is a partial backport of [[https://github.com/bitcoin/bitcoin/pull/23474 | core#23474]]: https://github.com/bitcoin/bitcoin/pull/23474/commits/fad13991aea6463ecf07dd907de1c1b23837d7e7

This is a partial backport of [[https://github.com/bitcoin/bitcoin/pull/23474 | core#23474:]]: https://github.com/bitcoin/bitcoin/pull/23474/commits/fad13991aea6463ecf07dd907de1c1b23837d7e7