Merge pull request #889 from jkczyz/2021-04-electrum-trait