Feature parity with https://github.com/bsv-blockchain/go-wallet-toolbox/pull/848
Feature parity with bsv-blockchain/go-wallet-toolbox#848