Change Details

This is a backport of [[https://github.com/bitcoin/bitcoin/pull/23235 | core#23235]] [2/4] https://github.com/bitcoin/bitcoin/pull/23235/commits/da94ebc2facd75c6105a7bd31765c6d2b37fc73b

This is a backport of [[https://github.com/bitcoin/bitcoin/pull/23235 | core#23235]] [2/4] https://github.com/bitcoin/bitcoin/pull/23235/commits/da94ebc2facd75c6105a7bd31765c6d2b37fc73b Depends on D12038