Change Details

This is a partial backport of core#23974 https://github.com/bitcoin/bitcoin/pull/23974/commits/facd3df21f344dd84e5f28862056700c1fded17c Depends on D12514

This is a partial backport of [[https://github.com/bitcoin/bitcoin/pull/23974 | core#23974]] https://github.com/bitcoin/bitcoin/pull/23974/commits/facd3df21f344dd84e5f28862056700c1fded17c Depends on D12514

This is a partial backport of [[https://github.com/bitcoin/bitcoin/pull/23974 | core#23974]] https://github.com/bitcoin/bitcoin/pull/23974/commits/facd3df21f344dd84e5f28862056700c1fded17c Depends on D12514