Change Details

Backport 1 of 3 for Core PR13554 https://github.com/bitcoin/bitcoin/pull/13554/commits/05dbb0c042ba647bf83c15f059c41620e2164337 T538

Partial backport of Core PR13554 (the other commits do not apply to ABC) https://github.com/bitcoin/bitcoin/pull/13554/commits/05dbb0c042ba647bf83c15f059c41620e2164337 Completes T538

BPartial backport 1 of 3 for Core PR13554of Core PR13554 (the other commits do not apply to ABC) https://github.com/bitcoin/bitcoin/pull/13554/commits/05dbb0c042ba647bf83c15f059c41620e2164337 Completes T538