Change Details

Backport this PR: https://github.com/bitcoin/bitcoin/pull/12953/commits

Backport this PR: Also https://github.com/bitcoin/bitcoin/pull/13825

Backport this PR: Also https://github.com/bitcoin/bitcoin/pull/12953/commits3825