Change Details

This is a backport of Core PR13558

This is a partial backport of Core PR13558: https://github.com/bitcoin/bitcoin/pull/13558/commits/da74db0940720407fafaf3582bbaf9c81a4d3b4d

This is a partial backport of Core PR1355813558: https://github.com/bitcoin/bitcoin/pull/13558/commits/da74db0940720407fafaf3582bbaf9c81a4d3b4d