SWC-1726
Merge pull request #1201 from jay-hodgson/rpc-test-round-3

SWC-1726