Merge pull request #2222 from ace20022/jsonrpc2