Merge "BUG-614: migrate RpcMetadata"