Merge branch 'feature/rpc'