Merge branch 'rpc_async'