Change Details

backport of https://github.com/spesmilo/electrum/commit/d7c5949365cf061020e5dfb82ca26171c0692eb6

backport of https://github.com/spesmilo/electrum/commit/d7c5949365cf061020e5dfb82ca26171c0692eb6 Depends on D16279

backport of https://github.com/spesmilo/electrum/commit/d7c5949365cf061020e5dfb82ca26171c0692eb6 Depends on D16279