Change Details

Partial backport of Core PR17497 https://github.com/bitcoin/bitcoin/pull/17497/commits/621d398750d9f5ce3e7ec75ccb160b3534dcc436 Test plan is broken without it.

Partial backport of Core [[https://github.com/bitcoin/bitcoin/pull/17497 | PR17497]] https://github.com/bitcoin/bitcoin/pull/17497/commits/621d398750d9f5ce3e7ec75ccb160b3534dcc436 Test plan is broken without it.

Partial backport of Core [[https://github.com/bitcoin/bitcoin/pull/17497 | PR17497]] https://github.com/bitcoin/bitcoin/pull/17497/commits/621d398750d9f5ce3e7ec75ccb160b3534dcc436 Test plan is broken without it.