Merge pull request #929 from jkczyz/2021-05-json-rpc-error