Merge pull request #1185 from grumvalski/core_rpc_fmt