Sync with mongo-cl-driver