Change some RPC calls for new data model.
Merge branch 'data-format'