Change Details

This is a backport of [[https://github.com/bitcoin/bitcoin/pull/18415 | core#18415]]

This is a backport of [[https://github.com/bitcoin/bitcoin/pull/18415 | core#18415]] https://github.com/bitcoin/bitcoin/pull/18415/commits/1a4e9f32efcc5f6a74290446dc58784fd85c7b31