Merge pull request #791 from jkczyz/2021-01-spv-client